Mercurial > hg
view tests/test-rebase-issue-noparam-single-rev.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 | 808f03f61ebe |
children | 4bb4895e1693 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head @ 4:r2 | o 3:r1 | | o 2:l1 |/ o 1:c2 | o 0:c1 % Rebase with no arguments - single revision in source branch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 3 files rebase completed @ 4:l1 | o 3:r2 | o 2:r1 | o 1:c2 | o 0:c1 0 files updated, 0 files merged, 2 files removed, 0 files unresolved created new head @ 4:r1 | | o 3:l2 | | | o 2:l1 |/ o 1:c2 | o 0:c1 % Rebase with no arguments - single revision in target branch 2 files updated, 0 files merged, 1 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 3 files rebase completed @ 4:l2 | o 3:l1 | o 2:r1 | o 1:c2 | o 0:c1