Mercurial > hg

view tests/test-rebase-mq-skip.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 7b19cda0fa10
children c7dbd6c4877a
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch

% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  3 P0 tags: p0.patch qtip tip qbase
|
o  2 P1 tags: qparent
|
o  1 R1 tags:
|
o  0 C1 tags: