diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-bookmarks-current.t | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-bookmarks-current.t')
| -rw-r--r-- | tests/test-bookmarks-current.t | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/tests/test-bookmarks-current.t b/tests/test-bookmarks-current.t index cc31c3e..f96a805 100644 --- a/tests/test-bookmarks-current.t +++ b/tests/test-bookmarks-current.t @@ -125,46 +125,3 @@ deactivate current bookmark while renaming $ hg bookmarks X 0:719295282060 Z 0:719295282060 - -bare update moves the active bookmark forward - - $ echo a > a - $ hg ci -Am1 - adding a - $ hg update X - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg bookmarks - * X 0:719295282060 - Z 0:719295282060 - $ hg update - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updating bookmark X - $ hg bookmarks - * X 1:cc586d725fbe - Z 0:719295282060 - -test deleting .hg/bookmarks.current when explicitly updating -to a revision - - $ echo a >> b - $ hg ci -m. - $ hg up -q X - $ test -f .hg/bookmarks.current - -try to update to it again to make sure we don't -set and then unset it - - $ hg up -q X - $ test -f .hg/bookmarks.current - - $ hg up -q 1 - $ test -f .hg/bookmarks.current - [1] - -when a bookmark is active, hg up -r . is -analogus to hg book -i <active bookmark> - - $ hg up -q X - $ hg up -q . - $ test -f .hg/bookmarks.current - [1] |