{"thread":{"id":"2480","subject":"[PATCH Cogito] Fix t/t9300-seek.sh","startedAt":"2005-11-12T22:39:14Z","lastAt":"2005-11-12T23:01:17Z","messageCount":4,"participants":["Fernando J. Pereda","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11707","messageId":"20051112223914.GA1150@ferdyx.org","threadId":"2480","inReplyTo":null,"subject":"[PATCH Cogito] Fix t/t9300-seek.sh","fromName":"Fernando J. Pereda","fromEmail":"ferdy@ferdyx.org","sentAt":"2005-11-12T22:39:14Z","receivedAt":"2005-11-12T22:39:14Z","isPatch":true,"sender":{"key":"ferdy@ferdyx.org","avatar":"https://gravatar.com/avatar/96bf7c1ddf7ccd430255bd12d9d42b212dbc033b28c668a2bdf9c3995aa81e61?d=mp&s=160"},"body":"After 'seeking' to the first commit, identical should have 'identical'\ninstead of 'nonconflicting'.\n\nSigned-off-by: Fernando J. Pereda <ferdy@gentoo.org>\n\n---\n\n t/t9300-seek.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\napplies-to: 25610e0bf9968dc98709a8ca271db70806c2dbac\n8c1240eaa91f1f805535287e7a6a037c341453b4\ndiff --git a/t/t9300-seek.sh b/t/t9300-seek.sh\nindex d3fed11..55a3f19 100755\n--- a/t/t9300-seek.sh\n+++ b/t/t9300-seek.sh\n@@ -82,8 +82,8 @@ test_expect_success 'current commit shou\n #\t\"[ -e newdir/newfile ] && [ -e newdir/newfile.rej ]\"\n test_expect_success 'different should be v1' \\\n \t\"[ $(cat different) = v1 ]\"\n-test_expect_success 'identical should be nonconflicting' \\\n-\t\"[ $(cat identical) = nonconflicting ]\"\n+test_expect_success 'identical should be identical' \\\n+\t\"[ $(cat identical) = identical ]\"\n \n test_expect_success 'unseeking' \\\n \t\"cg-seek\"\n---\n0.99.9g\n"},{"id":"11708","messageId":"20051112224743.GJ30496@pasky.or.cz","threadId":"2480","inReplyTo":"20051112223914.GA1150@ferdyx.org","subject":"Re: [PATCH Cogito] Fix t/t9300-seek.sh","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-12T22:47:43Z","receivedAt":"2005-11-12T22:47:43Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, Nov 12, 2005 at 11:39:14PM CET, I got a letter\nwhere \"Fernando J. Pereda\" <ferdy@ferdyx.org> said that...\n> After 'seeking' to the first commit, identical should have 'identical'\n> instead of 'nonconflicting'.\n\nNope, since we locally change it to \"nonconflicting\", and cg-seek is\nsupposed to keep local changes.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"11709","messageId":"20051112225525.GA13674@ferdyx.org","threadId":"2480","inReplyTo":"20051112224743.GJ30496@pasky.or.cz","subject":"Re: [PATCH Cogito] Fix t/t9300-seek.sh","fromName":"Fernando J. Pereda","fromEmail":"ferdy@ferdyx.org","sentAt":"2005-11-12T22:55:25Z","receivedAt":"2005-11-12T22:55:25Z","isPatch":true,"sender":{"key":"ferdy@ferdyx.org","avatar":"https://gravatar.com/avatar/96bf7c1ddf7ccd430255bd12d9d42b212dbc033b28c668a2bdf9c3995aa81e61?d=mp&s=160"},"body":"On Sat, Nov 12, 2005 at 11:47:43PM +0100, Petr Baudis wrote:\n| Dear diary, on Sat, Nov 12, 2005 at 11:39:14PM CET, I got a letter\n| where \"Fernando J. Pereda\" <ferdy@ferdyx.org> said that...\n| > After 'seeking' to the first commit, identical should have 'identical'\n| > instead of 'nonconflicting'.\n| \n| Nope, since we locally change it to \"nonconflicting\", and cg-seek is\n| supposed to keep local changes.\n\nOuch... I failed to see that. Then that test is failing for me,\n'identical' actually contains 'identical'. I used cogito-0.16rc1 is it\nsuposed to work? Or is it known to be broken?\n\nCheers,\nFerdy\n\n-- \nFernando J. Pereda Garcimartín\nGentoo Developer (Alpha,net-mail,mutt,git)\n20BB BDC3 761A 4781 E6ED  ED0B 0A48 5B0C 60BD 28D4\n"},{"id":"11710","messageId":"20051112230117.GB13674@ferdyx.org","threadId":"2480","inReplyTo":"20051112225525.GA13674@ferdyx.org","subject":"Re: [PATCH Cogito] Fix t/t9300-seek.sh","fromName":"Fernando J. Pereda","fromEmail":"ferdy@ferdyx.org","sentAt":"2005-11-12T23:01:17Z","receivedAt":"2005-11-12T23:01:17Z","isPatch":true,"sender":{"key":"ferdy@ferdyx.org","avatar":"https://gravatar.com/avatar/96bf7c1ddf7ccd430255bd12d9d42b212dbc033b28c668a2bdf9c3995aa81e61?d=mp&s=160"},"body":"On Sat, Nov 12, 2005 at 11:55:25PM +0100, Fernando J. Pereda wrote:\n| On Sat, Nov 12, 2005 at 11:47:43PM +0100, Petr Baudis wrote:\n| | Dear diary, on Sat, Nov 12, 2005 at 11:39:14PM CET, I got a letter\n| | where \"Fernando J. Pereda\" <ferdy@ferdyx.org> said that...\n| | > After 'seeking' to the first commit, identical should have 'identical'\n| | > instead of 'nonconflicting'.\n| | \n| | Nope, since we locally change it to \"nonconflicting\", and cg-seek is\n| | supposed to keep local changes.\n| \n| Ouch... I failed to see that. Then that test is failing for me,\n| 'identical' actually contains 'identical'. I used cogito-0.16rc1 is it\n| suposed to work? Or is it known to be broken?\n\nActually don't mind me. It justs fails under the Gentoo sandbox. Sorry\nfor the noise.\n\nCheers,\nFerdy\n\n-- \nFernando J. Pereda Garcimartín\nGentoo Developer (Alpha,net-mail,mutt,git)\n20BB BDC3 761A 4781 E6ED  ED0B 0A48 5B0C 60BD 28D4\n"}]}