diff -r 5fa287e5087e -r d702f0d26c6a tests/test-obsolete-rebase.t --- a/tests/test-obsolete-rebase.t Tue Aug 07 15:38:20 2012 +0200 +++ b/tests/test-obsolete-rebase.t Tue Aug 07 16:02:50 2012 +0200 @@ -53,7 +53,7 @@ |/ o 0:07f494440405@default(draft) adda - $ hg debugsuccessors + $ hg debugobsolete $ hg --config extensions.hgext.mq= strip tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg @@ -78,8 +78,8 @@ |/ o 0:07f494440405@default(draft) adda - $ hg debugsuccessors - 98e4a024635e 9c5494949763 + $ hg debugobsolete + 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob) Test rebase with deleted empty revision @@ -104,9 +104,9 @@ |/ o 0:07f494440405@default(draft) adda - $ hg debugsuccessors - 4e322f7ce8e3 000000000000 - 98e4a024635e 9c5494949763 + $ hg debugobsolete + 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob) + 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob) Test rebase --collapse @@ -139,15 +139,15 @@ |/ o 0:07f494440405@default(draft) adda - $ hg debugsuccessors - 03f31481307a a7773ffa7edc - 076e9b2ffbe1 a7773ffa7edc - 4e322f7ce8e3 000000000000 - 98e4a024635e 9c5494949763 + $ hg debugobsolete + 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob) + 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob) + 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) + 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) Test rebase --abort - $ hg debugsuccessors > ../successors.old + $ hg debugobsolete > ../successors.old $ hg up 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo d > d @@ -164,7 +164,7 @@ $ hg rebase --abort saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg rebase aborted - $ hg debugsuccessors > ../successors.new + $ hg debugobsolete > ../successors.new $ diff -u ../successors.old ../successors.new Test rebase --continue @@ -204,15 +204,14 @@ |/ o 0:07f494440405@default(draft) adda - $ hg debugsuccessors > ../successors.new + $ hg debugobsolete > ../successors.new $ diff -u ../successors.old ../successors.new --- ../successors.old* (glob) +++ ../successors.new* (glob) - @@ -1,4 +1,6 @@ - 03f31481307a a7773ffa7edc - 076e9b2ffbe1 a7773ffa7edc - +4b9d80f48523 1951ead97108 - 4e322f7ce8e3 000000000000 - 98e4a024635e 9c5494949763 - +a31943eabc43 03f165c84ea8 + @@ -2,3 +2,5 @@ + 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 0000000000000000000000000000000000000000 0 {'date': '* *', 'user': 'test'} (glob) + 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) + 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) + +4b9d80f48523e296f4402cc8e37236b768dfb981 1951ead9710803dbf117e95901954d5ed717f80b 0 {'date': '* *', 'user': 'test'} (glob) + +a31943eabc4327df16f9eca71bf7779c32f815f7 03f165c84ea8889fc35a64a392caa7a0084dd212 0 {'date': '* *', 'user': 'test'} (glob) [1]