From patchwork Wed Aug 13 00:24:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [evolve-ext] evolve: fix the 'grab' alias to work on Windows From: Matt Harbison X-Patchwork-Id: 5368 Message-Id: To: mercurial-devel@selenic.com Date: Wed, 13 Aug 2014 00:24:45 +0000 (UTC) On Tue, 12 Aug 2014 19:56:26 -0400, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison > # Date 1407884993 14400 > # Tue Aug 12 19:09:53 2014 -0400 > # Node ID 51cda4d2bb2cd52f4e90bf35c4243e33c8ec71bb > # Parent 66f4c5c52d970f145cd218ceed065c3fe096631d > evolve: fix the 'grab' alias to work on Windows > > $ ../../hg/tests/run-tests.py --with-hg=../../hg/hg --blacklist windows > Skipped test-simple4server.t: blacklisted > Warned test-obsolete.t: no result code from test > Warned test-tutorial.t: no result code from test > Warned test-evolve.t: no result code from test > Warned test-userguide.t: no result code from test > Warned test-sharing.t: no result code from test > Warned test-drop.t: no result code from test > Failed test-prune.t: output changed > # Ran 41 tests, 1 skipped, 6 warned, 1 failed. The prune failure seems like a real bug in evolve d2fe19c818ea / hg fff8e1cec90f: The full context is this, where the last line is added: $ hg prune -B todelete 1 changesets pruned 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (leaving bookmark todelete) working directory now at d62d843c9a01 bookmark 'todelete' deleted $ hg id -ir dcbb326fdec2 abort: unknown revision 'dcbb326fdec2'! [255] $ hg id -ir d62d843c9a01 d62d843c9a01 $ hg bookmarks B 10:ff43616e5d0f delete 6:2702dd0c91e7 todelete 8:d62d843c9a01 I added a state check just before the above excerpt: $ hg bookmarks B 10:ff43616e5d0f delete 6:2702dd0c91e7 * todelete 9:dcbb326fdec2 So the bookmark deactivated and moved on Windows, but deletes on Linux. I'm not sure what the desired behavior is (I assume Linux behavior), or if this is an evolve problem or a bookmark problem. --Matt diff --git a/tests/test-prune.t b/tests/test-prune.t --- a/tests/test-prune.t +++ b/tests/test-prune.t @@ -257,6 +257,7 @@ $ hg bookmarks B 10:ff43616e5d0f delete 6:2702dd0c91e7 + todelete 8:d62d843c9a01 $ hg prune -B delete 3 changesets pruned bookmark 'delete' deleted