[PATCH 2 of 5] histedit: replace various nodes lists with replacement graph (and issue3582)
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Tue Oct 9 23:04:17 CDT 2012
On 10 oct. 2012, at 02:03, Augie Fackler wrote:
> More comments on this one. This patch is so massive I'm done reviewing the series until the next round. I would consider applying edits myself, but I need the questions from the first patch addressed.
Updated series is pullable from "hg pull -r 21047ccd57c8 http://hg-lab.logilab.org/wip/hg/"
I'm waiting for the issue3655 matter to be discussed before I resent it to the list.
>> diff --git a/tests/test-histedit-bookmark-motion.t b/tests/test-histedit-bookmark-motion.t
>> --- a/tests/test-histedit-bookmark-motion.t
>> +++ b/tests/test-histedit-bookmark-motion.t
>> @@ -82,21 +82,16 @@
>>> pick 055a42cdd887 3 d
>>> fold e860deea161a 4 e
>>> pick 652413bf663e 5 f
>>> EOF
>> $ hg histedit 1 --commands commands.txt --verbose | grep histedit
>> - histedit: Should update metadata for the following changes:
>> - histedit: 055a42cdd887 to ae467701c500
>> - histedit: moving bookmarks three
>> - histedit: 177f92b77385 to d36c0562f908
>> - histedit: moving bookmarks also-two, two
>> - histedit: 652413bf663e to 0efacef7cb48
>> - histedit: moving bookmarks five
>> - histedit: d2ae7f538514 to cb9a9f314b8b
>> - histedit: moving bookmarks will-move-backwards
>> - histedit: e860deea161a to ae467701c500
>> - histedit: moving bookmarks four
>> + histedit: moving bookmarks two from 177f92b77385 to d36c0562f908
>> + histedit: moving bookmarks three from 055a42cdd887 to ae467701c500
>> + histedit: moving bookmarks four from e860deea161a to ae467701c500
>> + histedit: moving bookmarks also-two from 177f92b77385 to d36c0562f908
>> + histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b
>> + histedit: moving bookmarks five from 652413bf663e to 0efacef7cb48
>
> This makes me want you to change the format, THEN change the implementation (or vice-versa). I think it's equivalent, but it'd be a nice touch to not have to trust my eyes.
+1 on that. Some minor reordering change will happen but they are easily eye checkable.
--
Pierre-Yves
More information about the Mercurial-devel
mailing list