{"thread":{"id":"3689","subject":"[PATCH] Don't use merge labels in the ed scripts","startedAt":"2006-03-21T20:54:14Z","lastAt":"2006-03-22T04:07:29Z","messageCount":5,"participants":["Pavel Roskin","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"17741","messageId":"20060321205414.8301.97041.stgit@dv.roinet.com","threadId":"3689","inReplyTo":null,"subject":"[PATCH] Don't use merge labels in the ed scripts","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-03-21T20:54:14Z","receivedAt":"2006-03-21T20:54:14Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"From: Pavel Roskin \n\nMerge labels keep changing, and they are not required to identify\nspecific lines uniquely for the test purposes.\n\nSigned-off-by: Pavel Roskin \n---\n\n .../tutorial-script/0010-alice-bob-fixup.ed | 2 +-\n .../tutorial-script/0017-alice-bob-fixup.ed | 4 ++--\n .../tutorial-script/0018-alice-charlie-fixup1.ed | 4 ++--\n .../tutorial-script/0019-alice-charlie-fixup2.ed | 4 ++--\n .../tutorial-script/0021-bob-alice-fixup1.ed | 4 ++--\n .../tutorial-script/0022-bob-alice-fixup2.ed | 2 +-\n 6 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/tutorial-script/0010-alice-bob-fixup.ed b/Documentation/tutorial-script/0010-alice-bob-fixup.ed\nindex 81b1360..35ba0c3 100644\n--- a/Documentation/tutorial-script/0010-alice-bob-fixup.ed\n+++ b/Documentation/tutorial-script/0010-alice-bob-fixup.ed\n@@ -1,3 +1,3 @@\n-/^<<<<<<< bob/,/^>>>>>>> bobswork/d\n+/^<<<<<<< /,/^>>>>>>> /d\n w\n q\ndiff --git a/Documentation/tutorial-script/0017-alice-bob-fixup.ed b/Documentation/tutorial-script/0017-alice-bob-fixup.ed\nindex ad04eb7..00626e3 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+/^<<<<<<< /d\n /^=======/,/^=======/+1d\n-/^>>>>>>> \\.merge_file_/d\n+/^>>>>>>> /d\n w\n q\ndiff --git a/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed b/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed\nindex 9682b4a..f73223c 100644\n--- a/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed\n+++ b/Documentation/tutorial-script/0018-alice-charlie-fixup1.ed\n@@ -1,7 +1,7 @@\n-/^<<<<<<< master/d\n+/^<<<<<<< /d\n /^rpn\\.o:/s/\\.h.*$/.h lexer.h/\n /^lexer\\.o:/s/:.*$/: lexer.h/\n-/^=======/,/^>>>>>>> charlie/d\n+/^=======/,/^>>>>>>> /d\n w\n q\n \ndiff --git a/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed b/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed\nindex 5d531de..75832f1 100644\n--- a/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed\n+++ b/Documentation/tutorial-script/0019-alice-charlie-fixup2.ed\n@@ -1,5 +1,5 @@\n-/^<<<<<<< master/,/^=======/d\n-/^>>>>>>> charlie/d\n+/^<<<<<<< /,/^=======/d\n+/^>>>>>>> /d\n w\n q\n \ndiff --git a/Documentation/tutorial-script/0021-bob-alice-fixup1.ed b/Documentation/tutorial-script/0021-bob-alice-fixup1.ed\nindex df703d5..9950144 100644\n--- a/Documentation/tutorial-script/0021-bob-alice-fixup1.ed\n+++ b/Documentation/tutorial-script/0021-bob-alice-fixup1.ed\n@@ -1,4 +1,4 @@\n-/^<<<<<<< master/,/^=======/d\n-/^>>>>>>> origin/d\n+/^<<<<<<< /,/^=======/d\n+/^>>>>>>> /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\nindex d8c5746..df1c077 100644\n--- a/Documentation/tutorial-script/0022-bob-alice-fixup2.ed\n+++ b/Documentation/tutorial-script/0022-bob-alice-fixup2.ed\n@@ -1,5 +1,5 @@\n /^#include \"stack\\.h\"/+1d\n /^#include \"lexer\\.h\"/+1,/^#include \"stack\\.h\"/d\n-/^<<<<<<< master/-1,/^>>>>>>> origin/d\n+/^<<<<<<< /-1,/^>>>>>>> /d\n w\n q\n"},{"id":"17743","messageId":"20060321205956.GX19263@pasky.or.cz","threadId":"3689","inReplyTo":"20060321205414.8301.97041.stgit@dv.roinet.com","subject":"Re: [PATCH] Don't use merge labels in the ed scripts","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-03-21T20:59:57Z","receivedAt":"2006-03-21T20:59:57Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Tue, Mar 21, 2006 at 09:54:14PM CET, I got a letter\nwhere Pavel Roskin said that...\n> From: Pavel Roskin \n> \n> Merge labels keep changing, and they are not required to identify\n> specific lines uniquely for the test purposes.\n> \n> Signed-off-by: Pavel Roskin \n\nWell, I sincerely hope that they won't change again. ;-)\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nRight now I am having amnesia and deja-vu at the same time. I think\nI have forgotten this before.\n"},{"id":"17744","messageId":"1142977465.8712.4.camel@dv","threadId":"3689","inReplyTo":"20060321205956.GX19263@pasky.or.cz","subject":"Re: [PATCH] Don't use merge labels in the ed scripts","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-03-21T21:44:25Z","receivedAt":"2006-03-21T21:44:25Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Hi, Petr!\n\nOn Tue, 2006-03-21 at 21:59 +0100, Petr Baudis wrote:\n> Dear diary, on Tue, Mar 21, 2006 at 09:54:14PM CET, I got a letter\n> where Pavel Roskin said that...\n> > From: Pavel Roskin \n> > \n> > Merge labels keep changing, and they are not required to identify\n> > specific lines uniquely for the test purposes.\n> > \n> > Signed-off-by: Pavel Roskin \n> \n> Well, I sincerely hope that they won't change again. ;-)\n\nActually, it would be nice to never expose labels starting with\n\".merge_file_\" - cogito should provide more meaningful labels instead.\n\nIf you prefer, I'll submit a minimal patch to 0017-alice-bob-fixup.ed\ninstead. Once \".merge_file_\" is gone, the \"tutorial\" testsuite would\ncheck that such labels never appear again.\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"17745","messageId":"20060321214818.GY19263@pasky.or.cz","threadId":"3689","inReplyTo":"1142977465.8712.4.camel@dv","subject":"Re: [PATCH] Don't use merge labels in the ed scripts","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-03-21T21:48:18Z","receivedAt":"2006-03-21T21:48:18Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":" Hi,\n\nDear diary, on Tue, Mar 21, 2006 at 10:44:25PM CET, I got a letter\nwhere Pavel Roskin said that...\n> On Tue, 2006-03-21 at 21:59 +0100, Petr Baudis wrote:\n> > Dear diary, on Tue, Mar 21, 2006 at 09:54:14PM CET, I got a letter\n> > where Pavel Roskin said that...\n> > > From: Pavel Roskin \n> > > \n> > > Merge labels keep changing, and they are not required to identify\n> > > specific lines uniquely for the test purposes.\n> > > \n> > > Signed-off-by: Pavel Roskin \n> > \n> > Well, I sincerely hope that they won't change again. ;-)\n> \n> Actually, it would be nice to never expose labels starting with\n> \".merge_file_\" - cogito should provide more meaningful labels instead.\n\n we shouldn't ever expose them, though. If we do, that's a bug.\n\n> If you prefer, I'll submit a minimal patch to 0017-alice-bob-fixup.ed\n> instead. Once \".merge_file_\" is gone, the \"tutorial\" testsuite would\n> check that such labels never appear again.\n\n Curious, it contains the old-style label yet does not fail here now.\nUnfortunately I have no time to play with it now. :-( A patch will be\nmost welcome.\n\n Thanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nRight now I am having amnesia and deja-vu at the same time. I think\nI have forgotten this before.\n"},{"id":"17753","messageId":"1143000449.23183.8.camel@dv","threadId":"3689","inReplyTo":"20060321214818.GY19263@pasky.or.cz","subject":"Re: [PATCH] Don't use merge labels in the ed scripts","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-03-22T04:07:29Z","receivedAt":"2006-03-22T04:07:29Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Hi, Petr!\n\nOn Tue, 2006-03-21 at 22:48 +0100, Petr Baudis wrote:\n> > > Well, I sincerely hope that they won't change again. ;-)\n> > \n> > Actually, it would be nice to never expose labels starting with\n> > \".merge_file_\" - cogito should provide more meaningful labels instead.\n> \n> we shouldn't ever expose them, though. If we do, that's a bug.\n\nIt turns out those labels were produced by \"git merge\". Either \"git\nmerge\" should be removed from the test, or \"cg-reset\" should be used\nafter the failure. I prefer the later since it's another test for\nCogito.\n\nOnce the mess from \"git merge\" is cleaned up, it turns out that the last\nmerge in the testsuite doesn't fail, and several final fixups are no\nlonger needed. I think it should be OK to remove corresponding code.\nIt has no Cogito commands other than cg-commit, which is already tested\nelsewhere.\n\nI'm sending you the new patch.\n\n-- \nRegards,\nPavel Roskin\n"}]}