Mercurial > evolve
comparison tests/test-obsolete-rebase.t @ 298:f597421662f7
obsolete: unify collapsed revisions markers handling
When collapsing A, B and C into D, amend was registering:
A -> D
B -> D
A -> B
C -> D
A -> C
while the rebase wrapper was doing:
A -> D
B -> D
C -> D
At this point, I have no argument to favor one or another or even a new
one like:
A -> B
B -> C
C -> D
so I am aligning the rebase implementation on the older amend one. At
least we can now change them all at once.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Thu, 21 Jun 2012 19:58:57 +0200 |
parents | 691cb55358b0 |
children | d68ccae92d52 |
comparison
equal
deleted
inserted
replaced
297:590ac023c536 | 298:f597421662f7 |
---|---|
107 |/ | 107 |/ |
108 o 0:07f494440405@default(draft) adda | 108 o 0:07f494440405@default(draft) adda |
109 | 109 |
110 $ hg debugsuccessors | 110 $ hg debugsuccessors |
111 03f31481307a a7773ffa7edc | 111 03f31481307a a7773ffa7edc |
112 076e9b2ffbe1 03f31481307a | |
112 076e9b2ffbe1 a7773ffa7edc | 113 076e9b2ffbe1 a7773ffa7edc |
113 4e322f7ce8e3 000000000000 | 114 4e322f7ce8e3 000000000000 |
114 98e4a024635e 9c5494949763 | 115 98e4a024635e 9c5494949763 |
115 | 116 |
116 Test rebase --abort | 117 Test rebase --abort |
174 | 175 |
175 $ hg debugsuccessors > ../successors.new | 176 $ hg debugsuccessors > ../successors.new |
176 $ diff -u ../successors.old ../successors.new | 177 $ diff -u ../successors.old ../successors.new |
177 --- ../successors.old* (glob) | 178 --- ../successors.old* (glob) |
178 +++ ../successors.new* (glob) | 179 +++ ../successors.new* (glob) |
179 @@ -1,4 +1,6 @@ | 180 @@ -1,5 +1,7 @@ |
180 03f31481307a a7773ffa7edc | 181 03f31481307a a7773ffa7edc |
182 076e9b2ffbe1 03f31481307a | |
181 076e9b2ffbe1 a7773ffa7edc | 183 076e9b2ffbe1 a7773ffa7edc |
182 +4b9d80f48523 1951ead97108 | 184 +4b9d80f48523 1951ead97108 |
183 4e322f7ce8e3 000000000000 | 185 4e322f7ce8e3 000000000000 |
184 98e4a024635e 9c5494949763 | 186 98e4a024635e 9c5494949763 |
185 +a31943eabc43 03f165c84ea8 | 187 +a31943eabc43 03f165c84ea8 |