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-mv-cp-st-diff.t | |
parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
download | mercurial-tarball-baserock/morph.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-mv-cp-st-diff.t')
-rw-r--r-- | tests/test-mv-cp-st-diff.t | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/test-mv-cp-st-diff.t b/tests/test-mv-cp-st-diff.t index 5342fea..025e62f 100644 --- a/tests/test-mv-cp-st-diff.t +++ b/tests/test-mv-cp-st-diff.t @@ -560,7 +560,6 @@ $4 - test description - parent to root: --rev . --rev 0 M a - b R b diff --git a/a b/a @@ -612,7 +611,6 @@ $4 - test description - parent to branch: --rev . --rev 2 M a - b A x/y R b @@ -908,7 +906,6 @@ $4 - test description - parent to root: --rev . --rev 0 M a - b R b R c @@ -978,7 +975,6 @@ $4 - test description - parent to branch: --rev . --rev 2 M a - b A x/y R b R c @@ -1142,7 +1138,7 @@ $4 - test description updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head - moving x/x to y/x (glob) + moving x/x to y/x ** directory move ** ** hg mv x y / add y/x x1 / add y/x x2 - working to parent: |