[PATCH resend] strip: move bookmarks to nearest ancestor rather than '.'

[Matt Mackall]

On Thu, 2012-07-05 at 13:06 -0500, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <raf at durin42.com>
> # Date 1340842377 18000
> # Node ID 42ded5c00fc8af2cac6827b95e4d25b9265f2a91
> # Parent  ca75bd99f740e03abc1bb506f7d7120a1d172f2e
> strip: move bookmarks to nearest ancestor rather than '.'

This fails two tests here, dropping for now:

--- /home/mpm/hg-test-/tests/test-bookmarks-strip.t
+++ /home/mpm/hg-test-/tests/test-bookmarks-strip.t.err
@@ -60,8 +60,8 @@
 list bookmarks
 
   $ hg book
-     test                      1:8cf31af87a2b
-     test2                     1:8cf31af87a2b
+     test                      0:5c9ad3787638
+     test2                     0:5c9ad3787638
 
 immediate rollback and reentrancy issue
 

ERROR: /home/mpm/hg-test-/tests/test-bookmarks-strip.t output changed
!..............................
--- /home/mpm/hg-test-/tests/test-commit-amend.t
+++ /home/mpm/hg-test-/tests/test-commit-amend.t.err
@@ -214,7 +214,7 @@
   saved backup bundle to
$TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg (glob)
   $ hg book
      book1                     1:7344472bd951
-   * book2                     1:7344472bd951
+     book2                     0:ad120869acf0
 
   $ echo '[defaults]' >> $HGRCPATH
   $ echo "commit=-d '0 0'" >> $HGRCPATH


-- 
Mathematics is the supreme nostalgia of our time.