Mercurial > hg
view tests/test-empty-group.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 | a3d73b3e1f8a |
children | 4c94b6d0fb1c |
line wrap: on
line source
adding init adding x adding y 0 files updated, 0 files merged, 2 files removed, 0 files unresolved adding x adding y created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) created new head requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 3 changes to 3 files updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 3 changes to 3 files updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved comparing with b searching for changes changeset: 4:fdb3c546e859 tag: tip parent: 1:1f703b3fcbc6 parent: 2:de997049e034 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m2 comparing with c searching for changes changeset: 3:f40f830c0024 parent: 2:de997049e034 parent: 1:1f703b3fcbc6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m1 comparing with c searching for changes changeset: 3:f40f830c0024 tag: tip parent: 2:de997049e034 parent: 1:1f703b3fcbc6 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m1 comparing with b searching for changes changeset: 3:fdb3c546e859 tag: tip parent: 1:1f703b3fcbc6 parent: 2:de997049e034 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: m2 pulling from a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) pulling from a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge)