Mercurial > evolve
changeset 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 | b41ff69388a8 |
| children | 8529b4b95f5d |
| files | hgext/obsolete.py tests/test-amend.t tests/test-evolve.t tests/test-obsolete-rebase.t tests/test-stabilize-order.t tests/test-stabilize-result.t |
| diffstat | 6 files changed, 5 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/obsolete.py Fri Jun 22 19:32:18 2012 +0200 +++ b/hgext/obsolete.py Sat Jun 23 11:14:09 2012 +0200 @@ -844,8 +844,6 @@ assert len(rootrevs) == 1, rootrevs rootnode = self[rootrevs[0]].node() for n in oldnodes: - if n != rootnode: - self.addobsolete(n, rootnode) self.addobsolete(newnode, n) def _turn_extinct_secret(self):
--- a/tests/test-amend.t Fri Jun 22 19:32:18 2012 +0200 +++ b/tests/test-amend.t Sat Jun 23 11:14:09 2012 +0200 @@ -26,7 +26,6 @@ $ hg amend $ hg debugsuccessors 07f494440405 a34b93d251e4 - 07f494440405 bd19cbe78fbf bd19cbe78fbf a34b93d251e4 $ hg branch foo @@ -65,7 +64,6 @@ [255] $ hg debugsuccessors 07f494440405 a34b93d251e4 - 07f494440405 bd19cbe78fbf bd19cbe78fbf a34b93d251e4 $ hg phase 2 2: draft @@ -92,7 +90,6 @@ [255] $ hg debugsuccessors 07f494440405 a34b93d251e4 - 07f494440405 bd19cbe78fbf 7384bbcba36f 000000000000 bd19cbe78fbf a34b93d251e4 $ glog
--- a/tests/test-evolve.t Fri Jun 22 19:32:18 2012 +0200 +++ b/tests/test-evolve.t Sat Jun 23 11:14:09 2012 +0200 @@ -213,8 +213,7 @@ 4 feature-B: another feature - test 1 : a nifty feature - test 0 : base - test - $ hg up -q 1 - Working directory parent is obsolete + $ hg up -q 0 $ glog --hidden o 6:23409eba69a0@default(draft) a nifty feature | @@ -226,15 +225,13 @@ | | | | | o 2:7b36850622b2@default(secret) another feature | |/ - | @ 1:568a468b60fc@default(draft) a nifty feature + | o 1:568a468b60fc@default(draft) a nifty feature |/ - o 0:e55e0562ee93@default(draft) base + @ 0:e55e0562ee93@default(draft) base $ hg debugsuccessors 524e478d4811 f8111a076f09 568a468b60fc 23409eba69a0 - 568a468b60fc e416e48b2742 - 7b36850622b2 524e478d4811 7b36850622b2 f8111a076f09 e416e48b2742 23409eba69a0 $ hg stabilize
--- a/tests/test-obsolete-rebase.t Fri Jun 22 19:32:18 2012 +0200 +++ b/tests/test-obsolete-rebase.t Sat Jun 23 11:14:09 2012 +0200 @@ -109,7 +109,6 @@ $ hg debugsuccessors 03f31481307a a7773ffa7edc - 076e9b2ffbe1 03f31481307a 076e9b2ffbe1 a7773ffa7edc 4e322f7ce8e3 000000000000 98e4a024635e 9c5494949763 @@ -177,9 +176,8 @@ $ diff -u ../successors.old ../successors.new --- ../successors.old* (glob) +++ ../successors.new* (glob) - @@ -1,5 +1,7 @@ + @@ -1,4 +1,6 @@ 03f31481307a a7773ffa7edc - 076e9b2ffbe1 03f31481307a 076e9b2ffbe1 a7773ffa7edc +4b9d80f48523 1951ead97108 4e322f7ce8e3 000000000000
--- a/tests/test-stabilize-order.t Fri Jun 22 19:32:18 2012 +0200 +++ b/tests/test-stabilize-order.t Sat Jun 23 11:14:09 2012 +0200 @@ -106,9 +106,9 @@ 3a4a591493f8 f5ff10856e5a 3ca0ded0dc50 ab8cbb6d87ff +7a7552255fb5 5e819fbb0d27 - 93418d2c0979 3a4a591493f8 93418d2c0979 f5ff10856e5a ab8cbb6d87ff 6bf44048e43f + ef23d6ef94d6 ab8cbb6d87ff [1] $ glog @ 9:5e819fbb0d27@default(draft) addc