Mercurial > hg
diff tests/test-mq-qpush-exact.t @ 14256:d04ba50e104d
mq: allow to qpop/push with a dirty working copy (issue2780)
It's safe to do so if the sets of changed files in the
working copy and patches are disjoint.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 06 May 2011 19:55:46 +0300 |
parents | e1c34ce39fae |
children | e9ed3506f066 |
line wrap: on
line diff
--- a/tests/test-mq-qpush-exact.t Fri May 06 19:03:41 2011 +0300 +++ b/tests/test-mq-qpush-exact.t Fri May 06 19:55:46 2011 +0300 @@ -163,8 +163,12 @@ $ hg update 1 -q $ echo c0 >> f0 $ hg qpush -e - abort: local changes found - [255] + applying p0 + now at: p0 + $ cat f0 + c0 + $ hg qpop -aq + patch queue now empty $ hg qpush -ef applying p0 now at: p0 @@ -178,8 +182,13 @@ $ hg update 1 -q $ echo c0 >> f0 $ hg qpush -e p1 - abort: local changes found - [255] + applying p0 + applying p1 + now at: p1 + $ cat f0 + c0 + $ hg qpop -aq + patch queue now empty $ hg qpush -e p1 -f applying p0 applying p1