Mercurial > hg
view tests/test-empty-group.out @ 8564:6b9ec23b09fc
named branches: improve pre-push logic (issue736)
Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.
Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Sat, 23 May 2009 17:04:31 +0200 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
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 working directory 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 working directory 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)