# [PATCH Cogito] Fix t/t9300-seek.sh 4 messages from 2005-11-12 to 2005-11-12. Participants: Fernando J. Pereda, Petr Baudis. Thread: https://gitlist.dev/t/2480 ## Fernando J. Pereda, 2005-11-12 22:39 Subject: [PATCH Cogito] Fix t/t9300-seek.sh Message-ID: <20051112223914.GA1150@ferdyx.org> URL: https://gitlist.dev/e/20051112223914.GA1150%40ferdyx.org ``` After 'seeking' to the first commit, identical should have 'identical' instead of 'nonconflicting'. Signed-off-by: Fernando J. Pereda --- t/t9300-seek.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) applies-to: 25610e0bf9968dc98709a8ca271db70806c2dbac 8c1240eaa91f1f805535287e7a6a037c341453b4 diff --git a/t/t9300-seek.sh b/t/t9300-seek.sh index d3fed11..55a3f19 100755 --- a/t/t9300-seek.sh +++ b/t/t9300-seek.sh @@ -82,8 +82,8 @@ test_expect_success 'current commit shou # "[ -e newdir/newfile ] && [ -e newdir/newfile.rej ]" test_expect_success 'different should be v1' \ "[ $(cat different) = v1 ]" -test_expect_success 'identical should be nonconflicting' \ - "[ $(cat identical) = nonconflicting ]" +test_expect_success 'identical should be identical' \ + "[ $(cat identical) = identical ]" test_expect_success 'unseeking' \ "cg-seek" --- 0.99.9g ``` ## Petr Baudis, 2005-11-12 22:47 Subject: Re: [PATCH Cogito] Fix t/t9300-seek.sh Message-ID: <20051112224743.GJ30496@pasky.or.cz> URL: https://gitlist.dev/e/20051112224743.GJ30496%40pasky.or.cz In-Reply-To: <20051112223914.GA1150@ferdyx.org> ``` Dear diary, on Sat, Nov 12, 2005 at 11:39:14PM CET, I got a letter where "Fernando J. Pereda" said that... > After 'seeking' to the first commit, identical should have 'identical' > instead of 'nonconflicting'. Nope, since we locally change it to "nonconflicting", and cg-seek is supposed to keep local changes. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't. ``` ## Fernando J. Pereda, 2005-11-12 22:55 Subject: Re: [PATCH Cogito] Fix t/t9300-seek.sh Message-ID: <20051112225525.GA13674@ferdyx.org> URL: https://gitlist.dev/e/20051112225525.GA13674%40ferdyx.org In-Reply-To: <20051112224743.GJ30496@pasky.or.cz> ``` On Sat, Nov 12, 2005 at 11:47:43PM +0100, Petr Baudis wrote: | Dear diary, on Sat, Nov 12, 2005 at 11:39:14PM CET, I got a letter | where "Fernando J. Pereda" said that... | > After 'seeking' to the first commit, identical should have 'identical' | > instead of 'nonconflicting'. | | Nope, since we locally change it to "nonconflicting", and cg-seek is | supposed to keep local changes. Ouch... I failed to see that. Then that test is failing for me, 'identical' actually contains 'identical'. I used cogito-0.16rc1 is it suposed to work? Or is it known to be broken? Cheers, Ferdy -- Fernando J. Pereda Garcimartín Gentoo Developer (Alpha,net-mail,mutt,git) 20BB BDC3 761A 4781 E6ED ED0B 0A48 5B0C 60BD 28D4 ``` ## Fernando J. Pereda, 2005-11-12 23:01 Subject: Re: [PATCH Cogito] Fix t/t9300-seek.sh Message-ID: <20051112230117.GB13674@ferdyx.org> URL: https://gitlist.dev/e/20051112230117.GB13674%40ferdyx.org In-Reply-To: <20051112225525.GA13674@ferdyx.org> ``` On Sat, Nov 12, 2005 at 11:55:25PM +0100, Fernando J. Pereda wrote: | On Sat, Nov 12, 2005 at 11:47:43PM +0100, Petr Baudis wrote: | | Dear diary, on Sat, Nov 12, 2005 at 11:39:14PM CET, I got a letter | | where "Fernando J. Pereda" said that... | | > After 'seeking' to the first commit, identical should have 'identical' | | > instead of 'nonconflicting'. | | | | Nope, since we locally change it to "nonconflicting", and cg-seek is | | supposed to keep local changes. | | Ouch... I failed to see that. Then that test is failing for me, | 'identical' actually contains 'identical'. I used cogito-0.16rc1 is it | suposed to work? Or is it known to be broken? Actually don't mind me. It justs fails under the Gentoo sandbox. Sorry for the noise. Cheers, Ferdy -- Fernando J. Pereda Garcimartín Gentoo Developer (Alpha,net-mail,mutt,git) 20BB BDC3 761A 4781 E6ED ED0B 0A48 5B0C 60BD 28D4 ```