{"thread":{"id":"3693","subject":"[PATCH] Clean up after failed \"git merge\" in the tutorial script","startedAt":"2006-03-22T04:07:33Z","lastAt":"2006-03-22T04:07:33Z","messageCount":1,"participants":["Pavel Roskin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"17754","messageId":"20060322040733.29189.75397.stgit@dv.roinet.com","threadId":"3693","inReplyTo":null,"subject":"[PATCH] Clean up after failed \"git merge\" in the tutorial script","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-03-22T04:07:33Z","receivedAt":"2006-03-22T04:07:33Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"From: Pavel Roskin <proski@gnu.org>\n\nFailed \"git merge\" in the tutorial script leaves some damage to the\nworking directory.  Use cg-reset to clean up the mess.\n\nThis eliminates conflicts in the final merge.  Adjust code accordingly,\nremove unused fixup scripts.\n\nAdjust 0017-alice-bob-fixup.ed to deal with merge conflict from cg-merge\nrather than \"git merge\".\n\nSigned-off-by: Pavel Roskin <proski@gnu.org>\n---\n\n .../tutorial-script/0017-alice-bob-fixup.ed        |    4 ++--\n .../tutorial-script/0021-bob-alice-fixup1.ed       |    4 ----\n .../tutorial-script/0022-bob-alice-fixup2.ed       |    5 -----\n .../tutorial-script/0023-bob-alice-fixup3.ed       |    4 ----\n Documentation/tutorial-script/script.sh            |   18 ++++--------------\n 5 files changed, 6 insertions(+), 29 deletions(-)\n\ndiff --git a/Documentation/tutorial-script/0017-alice-bob-fixup.ed b/Documentation/tutorial-script/0017-alice-bob-fixup.ed\nindex ad04eb7..1b06f4e 100644\n--- a/Documentation/tutorial-script/0017-alice-bob-fixup.ed\n+++ b/Documentation/tutorial-script/0017-alice-bob-fixup.ed\n@@ -1,5 +1,5 @@\n-/^<<<<<<< Makefile/d\n+/^<<<<<<< master/d\n /^=======/,/^=======/+1d\n-/^>>>>>>> \\.merge_file_/d\n+/^>>>>>>> bob/d\n w\n q\ndiff --git a/Documentation/tutorial-script/0021-bob-alice-fixup1.ed b/Documentation/tutorial-script/0021-bob-alice-fixup1.ed\ndeleted file mode 100644\nindex df703d5..0000000\n--- a/Documentation/tutorial-script/0021-bob-alice-fixup1.ed\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-/^<<<<<<< master/,/^=======/d\n-/^>>>>>>> origin/d\n-w\n-q\ndiff --git a/Documentation/tutorial-script/0022-bob-alice-fixup2.ed b/Documentation/tutorial-script/0022-bob-alice-fixup2.ed\ndeleted file mode 100644\nindex d8c5746..0000000\n--- a/Documentation/tutorial-script/0022-bob-alice-fixup2.ed\n+++ /dev/null\n@@ -1,5 +0,0 @@\n-/^#include \"stack\\.h\"/+1d\n-/^#include \"lexer\\.h\"/+1,/^#include \"stack\\.h\"/d\n-/^<<<<<<< master/-1,/^>>>>>>> origin/d\n-w\n-q\ndiff --git a/Documentation/tutorial-script/0023-bob-alice-fixup3.ed b/Documentation/tutorial-script/0023-bob-alice-fixup3.ed\ndeleted file mode 100644\nindex fea2fc7..0000000\n--- a/Documentation/tutorial-script/0023-bob-alice-fixup3.ed\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-/^#endif/s;^#endif.*;#endif /* STACK_H */;\n-w\n-q\n-\ndiff --git a/Documentation/tutorial-script/script.sh b/Documentation/tutorial-script/script.sh\nindex 0401954..f07dfc1 100755\n--- a/Documentation/tutorial-script/script.sh\n+++ b/Documentation/tutorial-script/script.sh\n@@ -222,12 +222,13 @@ git merge \"Integrate changes from Bob an\n \n # Automatic 3-way merge fails! Have to do it step by step\n \n+cg-reset\n cg-merge bob && should_fail\n \n # Merge fails:\n \n #: ...\n-#: <<<<<<< Makefile\n+#: <<<<<<< master\n #:\t$(CC) $(CFLAGS) $^ -lm -o $@\n #: =======\n #:\t$(CC) $(CFLAGS) $^ -o $@\n@@ -235,7 +236,7 @@ cg-merge bob && should_fail\n #: rpn.o: stack.h\n #: stack.o: stack.h\n #: lexer.o:\t\n-#: >>>>>>> .merge_file_iNhznP\n+#: >>>>>>> bob\n \n ed Makefile < $TOP/0017-alice-bob-fixup.ed\n \n@@ -313,18 +314,7 @@ cg-fetch\n git verify-tag rpn-0.4 && should_fail\n \n # Everything's OK, integrate the changes\n-echo \"Merge with 0.4\" | cg-merge && should_fail\n-\n-# Merge conflicts in Makefile, rpn.c\n-ed Makefile < $TOP/0021-bob-alice-fixup1.ed\n-ed rpn.c    < $TOP/0022-bob-alice-fixup2.ed\n-# Resolve conflicting addition of two versions of stack.h\n-rm stack.h~master\n-mv stack.h~origin stack.h\n-cg-add stack.h\n-\n-# Now commit the whole\n-cg-commit -m \"Merge with 0.4\"\n+cg-merge\n \n # Great, we are done.\n trap - exit\n"}]}