{"thread":{"id":"20117","subject":"[StGit PATCH] t2800: Adapt to changes in git's conflict markers","startedAt":"2009-07-15T09:54:08Z","lastAt":"2009-07-18T19:51:03Z","messageCount":2,"participants":["Karl Wiberg","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"118009","messageId":"20090715095312.1705.13477.stgit@october.e.vtech","threadId":"20117","inReplyTo":null,"subject":"[StGit PATCH] t2800: Adapt to changes in git's conflict markers","fromName":"Karl Wiberg","fromEmail":"kha@treskal.com","sentAt":"2009-07-15T09:54:08Z","receivedAt":"2009-07-15T09:54:08Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"From: Karl Wiberg <kha@treskal.com>\n\nThe conflict markers used by git were changed slightly by commit\n606475f3 (\"Remove filename from conflict markers\"); specifically, the\nconflict markers contain the filename only when the filename has\nchanged.\n\nThis patch adapts t2800 to allow either the new or the old format.\n\nSigned-off-by: Karl Wiberg <kha@treskal.com>\n\n---\n\n t/t2800-goto-subdir.sh |   17 +++++++++++++++--\n 1 files changed, 15 insertions(+), 2 deletions(-)\n\n\ndiff --git a/t/t2800-goto-subdir.sh b/t/t2800-goto-subdir.sh\nindex 855972b..5960bd6 100755\n--- a/t/t2800-goto-subdir.sh\n+++ b/t/t2800-goto-subdir.sh\n@@ -36,7 +36,8 @@ test_expect_success 'Prepare conflicting goto' '\n     stg delete p2\n '\n \n-cat > expected1.txt <<EOF\n+# git gives this result before commit 606475f3 ...\n+cat > expected1a.txt <<EOF\n foo1\n <<<<<<< current:foo/bar\n =======\n@@ -44,6 +45,17 @@ foo2\n foo3\n >>>>>>> patched:foo/bar\n EOF\n+\n+# ... and this result after commit 606475f3.\n+cat > expected1b.txt <<EOF\n+foo1\n+<<<<<<< current\n+=======\n+foo2\n+foo3\n+>>>>>>> patched\n+EOF\n+\n cat > expected2.txt <<EOF\n bar\n EOF\n@@ -51,7 +63,8 @@ test_expect_success 'Goto in subdirectory (conflicting push)' '\n     (cd foo && stg goto --keep p3) ;\n     [ $? -eq 3 ] &&\n     cat foo/bar > actual.txt &&\n-    test_cmp expected1.txt actual.txt &&\n+    ( test_cmp expected1a.txt actual.txt \\\n+      || test_cmp expected1b.txt actual.txt ) &&\n     ls foo > actual.txt &&\n     test_cmp expected2.txt actual.txt\n '\n"},{"id":"118245","messageId":"7v7hy53h3s.fsf@alter.siamese.dyndns.org","threadId":"20117","inReplyTo":"20090715095312.1705.13477.stgit@october.e.vtech","subject":"Re: [StGit PATCH] t2800: Adapt to changes in git's conflict markers","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-07-18T19:51:03Z","receivedAt":"2009-07-18T19:51:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karl Wiberg <kha@treskal.com> writes:\n\n> From: Karl Wiberg <kha@treskal.com>\n>\n> The conflict markers used by git were changed slightly by commit\n> 606475f3 (\"Remove filename from conflict markers\"); specifically, the\n> conflict markers contain the filename only when the filename has\n> changed.\n>\n> This patch adapts t2800 to allow either the new or the old format.\n>\n> Signed-off-by: Karl Wiberg <kha@treskal.com>\n\nThanks; Cc'ed Martin Renold <martinxyz@gmx.ch>.\n"}]}