Mercurial > evolve
comparison tests/test-obsolete-rebase.t @ 302:d68ccae92d52
obsolete: make collapse create less markers
Collapsing A and B into C was registering:
A -> C
B -> C
A -> B
At this point, the last relation brings nothing and is removed for the
sake of simplicity:
A -> C
B -> C
test-evolve.t is slightly modified as one of the relations let stabilize
compute a target outside of the parent revision tree. This is a
stabilize bug, not trivial to fix, so let's tweak the test for now.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sat, 23 Jun 2012 11:14:09 +0200 |
parents | f597421662f7 |
children | 5eecfda0a5c7 |
comparison
equal
deleted
inserted
replaced
301:b41ff69388a8 | 302:d68ccae92d52 |
---|---|
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 | |
113 076e9b2ffbe1 a7773ffa7edc | 112 076e9b2ffbe1 a7773ffa7edc |
114 4e322f7ce8e3 000000000000 | 113 4e322f7ce8e3 000000000000 |
115 98e4a024635e 9c5494949763 | 114 98e4a024635e 9c5494949763 |
116 | 115 |
117 Test rebase --abort | 116 Test rebase --abort |
175 | 174 |
176 $ hg debugsuccessors > ../successors.new | 175 $ hg debugsuccessors > ../successors.new |
177 $ diff -u ../successors.old ../successors.new | 176 $ diff -u ../successors.old ../successors.new |
178 --- ../successors.old* (glob) | 177 --- ../successors.old* (glob) |
179 +++ ../successors.new* (glob) | 178 +++ ../successors.new* (glob) |
180 @@ -1,5 +1,7 @@ | 179 @@ -1,4 +1,6 @@ |
181 03f31481307a a7773ffa7edc | 180 03f31481307a a7773ffa7edc |
182 076e9b2ffbe1 03f31481307a | |
183 076e9b2ffbe1 a7773ffa7edc | 181 076e9b2ffbe1 a7773ffa7edc |
184 +4b9d80f48523 1951ead97108 | 182 +4b9d80f48523 1951ead97108 |
185 4e322f7ce8e3 000000000000 | 183 4e322f7ce8e3 000000000000 |
186 98e4a024635e 9c5494949763 | 184 98e4a024635e 9c5494949763 |
187 +a31943eabc43 03f165c84ea8 | 185 +a31943eabc43 03f165c84ea8 |