{"thread":{"id":"17272","subject":"feature request mergetool, skip, abort","startedAt":"2009-01-20T16:39:59Z","lastAt":"2009-01-21T14:26:18Z","messageCount":3,"participants":["Caleb Cushing","Charles Bailey"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"101266","messageId":"81bfc67a0901200839q361923f1xb25ddadfdac37981@mail.gmail.com","threadId":"17272","inReplyTo":null,"subject":"feature request mergetool, skip, abort","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-01-20T16:39:59Z","receivedAt":"2009-01-20T16:39:59Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":"firstly my patch sucks, and I know it. but hopefully it'll give some\nidea of what I'm trying to do and someone can implement it properly.\n\nbasically there are some files, that I can't merge with git, but I\nneed to merge other files before I can fix those and I like to use\nmergetool, so I want a way to skip the files I'm not going to be able\nto merge.\n\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n\n\nFrom b43603bcd408cccea7ba55041a8356d0ca536989 Mon Sep 17 00:00:00 2001\nFrom: Caleb Cushing <xenoterracide@gmail.com>\nDate: Tue, 20 Jan 2009 11:33:30 -0500\nSubject: [PATCH] preliminary merge/skip/abort patch\n\n---\n git-mergetool.sh |   22 ++++++++++++++++++----\n 1 files changed, 18 insertions(+), 4 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 00e1337..c0b27ed 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -177,11 +177,25 @@ merge_file () {\n     describe_file \"$local_mode\" \"local\" \"$LOCAL\"\n     describe_file \"$remote_mode\" \"remote\" \"$REMOTE\"\n     if \"$prompt\" = true; then\n-\tprintf \"Hit return to start merge resolution tool (%s): \" \"$merge_tool\"\n-\tread ans\n-    fi\n+\t\twhile true; do\n+\t\tprintf \"Use (m)erge file or (s)skip file, or (a)bort? (%s): \" \\\n+\t\t\"$merge_tool\"\n+\t\tread ans\n+\t\tcase \"$ans\" in\n+\t\t\t[mM]*)\n+\t\t\tbreak\n+\t\t\t;;\n+\t\t\t[sS]*)\n+\t\t\treturn 0 #go to the next file, needs to clean up\n+\t\t\t;;\n+\t\t\t[aA]*)\n+\t\t\treturn 1 #should exit immediately, doesn't\n+\t\t\t;;\n+\t\tesac\n+\t\tdone\n+\tfi\n \n-    case \"$merge_tool\" in\n+\tcase \"$merge_tool\" in\n \tkdiff3)\n \t    if base_present ; then\n \t\t(\"$merge_tool_path\" --auto --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" \\\n-- \n1.6.1\n\n"},{"id":"101373","messageId":"20090121112236.GC18488@hashpling.org","threadId":"17272","inReplyTo":"81bfc67a0901200839q361923f1xb25ddadfdac37981@mail.gmail.com","subject":"Re: feature request mergetool, skip, abort","fromName":"Charles Bailey","fromEmail":"charles@hashpling.org","sentAt":"2009-01-21T11:22:36Z","receivedAt":"2009-01-21T11:22:36Z","isPatch":false,"sender":{"key":"charles@hashpling.org","avatar":"https://avatars.githubusercontent.com/u/1668475?v=4"},"body":"On Tue, Jan 20, 2009 at 11:39:59AM -0500, Caleb Cushing wrote:\n> firstly my patch sucks, and I know it. but hopefully it'll give some\n> idea of what I'm trying to do and someone can implement it properly.\n> \n> basically there are some files, that I can't merge with git, but I\n> need to merge other files before I can fix those and I like to use\n> mergetool, so I want a way to skip the files I'm not going to be able\n> to merge.\n> \n\nFor some reason I couldn't see a patch, but I like the idea of this\nfrom the description and I was at very early stage of working on\nsomething similar myself but it stalled due to other commitments.\n\nFor the moment the only way to 'skip' files is by passing full paths\nof what you *don't* want to skip to mergetool which isn't really the\nsame thing at all.\n\n-- \nCharles Bailey\nhttp://ccgi.hashpling.plus.com/blog/\n"},{"id":"101382","messageId":"81bfc67a0901210626i7cd75d1dh77c9cfae8b23b5c5@mail.gmail.com","threadId":"17272","inReplyTo":"20090121112236.GC18488@hashpling.org","subject":"Re: feature request mergetool, skip, abort","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-01-21T14:26:18Z","receivedAt":"2009-01-21T14:26:18Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":"patch was an attachement.\n\nafter looking through the list and seeing the conventions I've a fully\nworking one now, so I'm going to start a new thread with it.\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n"}]}