diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-mq-qrename.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-mq-qrename.t')
| -rw-r--r-- | tests/test-mq-qrename.t | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/tests/test-mq-qrename.t b/tests/test-mq-qrename.t index 6baf88c..621507b 100644 --- a/tests/test-mq-qrename.t +++ b/tests/test-mq-qrename.t @@ -76,8 +76,8 @@ Test overlapping renames (issue2388) $ hg qrename patchb patchc $ hg qrename patcha patchb $ hg st --mq + M patchb M series - A patchb A patchc R patcha $ cd .. @@ -94,32 +94,3 @@ Test renames with mq repo (issue2097) nothing changed [1] $ cd .. - -Test renaming to a folded patch (issue3058) - - $ hg init issue3058 - $ cd issue3058 - $ hg init --mq - $ echo a > a - $ hg add a - $ hg qnew adda - $ echo b >> a - $ hg qnew addb - $ hg qpop - popping addb - now at: adda - $ hg ci --mq -m "save mq" - $ hg qfold addb - $ hg qmv addb - $ cat .hg/patches/addb - # HG changeset patch - # Parent 0000000000000000000000000000000000000000 - - diff -r 000000000000 a - --- /dev/null * (glob) - +++ b/a * (glob) - @@ -0,0 +1,2 @@ - +a - +b - $ cd .. - |