{"thread":{"id":"13392","subject":"[PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI","startedAt":"2008-05-06T10:53:56Z","lastAt":"2008-05-11T19:08:13Z","messageCount":5,"participants":["Sebastian Schuberth","Steffen Prohaska","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"76195","messageId":"482038C4.6050402@visageimaging.com","threadId":"13392","inReplyTo":null,"subject":"[PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@visageimaging.com","sentAt":"2008-05-06T10:53:56Z","receivedAt":"2008-05-06T10:53:56Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"When run from the command line, ECMerge does not automatically use the same\nsettings for a merge / diff that it would use when starting the GUI and loading\nfiles manually. In the first case the built-in factory defaults would be used,\nwhile in the second case the settings the user has specified in the GUI would\nbe used, which can be misleading. Specifying the \"--default\" command line\noption changes this behavior so that always the user specfified GUI settings\nare used.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@visageimaging.com>\n---\n git-mergetool.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 5c86f69..fcdec4a 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -237,9 +237,9 @@ merge_file () {\n \tecmerge)\n \t    touch \"$BACKUP\"\n \t    if base_present; then\n-\t\t\"$merge_tool_path\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" --mode=merge3 --to=\"$MERGED\"\n+\t\t\"$merge_tool_path\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" --default --mode=merge3 --to=\"$MERGED\"\n \t    else\n-\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" --mode=merge2 --to=\"$MERGED\"\n+\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" --default --mode=merge2 --to=\"$MERGED\"\n \t    fi\n \t    check_unchanged\n \t    ;;\n-- \n1.5.5.GIT\n"},{"id":"76198","messageId":"fvphjn$im$1@ger.gmane.org","threadId":"13392","inReplyTo":"482038C4.6050402@visageimaging.com","subject":"Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@visageimaging.com","sentAt":"2008-05-06T12:06:14Z","receivedAt":"2008-05-06T12:06:14Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"> be used, which can be misleading. Specifying the \"--default\" command line\n> option changes this behavior so that always the user specfified GUI settings\n> are used.\n> \n> Signed-off-by: Sebastian Schuberth <sschuberth@visageimaging.com>\n\nSorry, I just saw the typo, of course this should say \"[...] user specified GUI settings [...]\". And the subject has two spaces between \"[...] by  the [...]\", which should be only one.\n\n-- \nSebastian Schuberth\n"},{"id":"76588","messageId":"183DBDB1-99BE-42C5-91DE-2488046164B7@zib.de","threadId":"13392","inReplyTo":"482038C4.6050402@visageimaging.com","subject":"Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-05-11T07:33:09Z","receivedAt":"2008-05-11T07:33:09Z","isPatch":true,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"\nOn May 6, 2008, at 12:53 PM, Sebastian Schuberth wrote:\n\n> When run from the command line, ECMerge does not automatically use  \n> the same\n> settings for a merge / diff that it would use when starting the GUI  \n> and loading\n> files manually. In the first case the built-in factory defaults  \n> would be used,\n> while in the second case the settings the user has specified in the  \n> GUI would\n> be used, which can be misleading. Specifying the \"--default\" command  \n> line\n> option changes this behavior so that always the user specfified GUI  \n> settings\n> are used.\n\n\nI tested the change and propose to take the patch.  I needed,\nhowever, to remove dos line endings from the patch before it\napplied cleanly.\n\n\tSteffen\n"},{"id":"76644","messageId":"7vy76g4uis.fsf@gitster.siamese.dyndns.org","threadId":"13392","inReplyTo":"183DBDB1-99BE-42C5-91DE-2488046164B7@zib.de","subject":"Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-11T17:31:39Z","receivedAt":"2008-05-11T17:31:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Steffen Prohaska <prohaska@zib.de> writes:\n\n> On May 6, 2008, at 12:53 PM, Sebastian Schuberth wrote:\n>\n>> When run from the command line, ECMerge does not automatically use\n>> the same\n>> settings for a merge / diff that it would use when starting the GUI\n>> and loading\n>> files manually. In the first case the built-in factory defaults\n>> would be used,\n>> while in the second case the settings the user has specified in the\n>> GUI would\n>> be used, which can be misleading. Specifying the \"--default\" command\n>> line\n>> option changes this behavior so that always the user specfified GUI\n>> settings\n>> are used.\n>\n> I tested the change and propose to take the patch.  I needed,\n> however, to remove dos line endings from the patch before it\n> applied cleanly.\n\nThanks, I did not have that \"apply\" problem.  \n\nQueued.\n"},{"id":"76657","messageId":"54B4FE81-30F2-4B4B-BE47-91661EF9745F@zib.de","threadId":"13392","inReplyTo":"7vy76g4uis.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-05-11T19:08:13Z","receivedAt":"2008-05-11T19:08:13Z","isPatch":true,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"\nOn May 11, 2008, at 7:31 PM, Junio C Hamano wrote:\n\n>> I tested the change and propose to take the patch.  I needed,\n>> however, to remove dos line endings from the patch before it\n>> applied cleanly.\n>\n> Thanks, I did not have that \"apply\" problem.\n\nIndeed, it is Mac OS X's Mail.app that exports mails with the\nwrong line endings.  I did not recognize this before, so I guess\nsomething changed with OS X 10.5, which I installed recently.\n\n\tSteffen\n"}]}