Mercurial > hg
diff tests/test-mq-qrename.t @ 12361:2754c8273132
Merge with stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 21 Sep 2010 23:37:47 +0200 |
parents | tests/test-mq-qrename@4ae3e5dffa60 tests/test-mq-qrename@b701610f6c56 |
children | b59b5193d4d0 |
line wrap: on
line diff
--- a/tests/test-mq-qrename.t Mon Sep 20 17:01:12 2010 -0500 +++ b/tests/test-mq-qrename.t Tue Sep 21 23:37:47 2010 +0200 @@ -59,4 +59,25 @@ $ cd .. +Test overlapping renames (issue2388) + $ hg init c + $ cd c + $ hg qinit -c + $ echo a > a + $ hg add + adding a + $ hg qnew patcha + $ echo b > b + $ hg add + adding b + $ hg qnew patchb + $ hg ci --mq -m c1 + $ hg qrename patchb patchc + $ hg qrename patcha patchb + $ hg st --mq + M patchb + M series + A patchc + R patcha + $ cd ..