Mercurial > hg
view tests/test-mq-qdelete.out @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 561ff8d9e4f0 |
children |
line wrap: on
line source
adding base abort: qdelete requires at least one revision or patch name abort: cannot delete applied patch c popping c now at: b a b a b series status popping b now at: a a b series status patch a finalized without changeset message 1 [mq]: a 0 base abort: cannot delete revision 3 above applied patches patch d finalized without changeset message patch e finalized without changeset message f 4 [mq]: f 3 [mq]: e 2 [mq]: d 1 [mq]: a 0 base adding base abort: no revisions specified no patches applied abort: revision 0 is not managed abort: cannot delete revision 2 above applied patches popping c now at: b abort: unknown revision 'c'! applying c patch c is empty now at: c patch a finalized without changeset message patch b finalized without changeset message c 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base patch c finalized without changeset message 3 imported patch c 2 [mq]: b 1 [mq]: a 0 base series status