Mercurial > hg

view tests/test-mq-qgoto.out @ 9717:68a1b9d0663e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a
popping c.patch
popping b.patch
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch
popping c.patch
now at: b.patch

% Using index
popping b.patch
now at: a.patch
applying b.patch
applying c.patch
now at: c.patch

% No warnings when using index
popping bug141421
popping bug314159
popping c.patch
now at: b.patch
applying c.patch
applying bug314159
now at: bug314159

% Detect ambiguous non-index
patch name "14" is ambiguous:
  bug314159
  bug141421
abort: patch 14 not in series