Mercurial > hg
view tests/test-push-warn.out @ 10771:01f097c4ae66 stable
push: fix bug in prepush logic and its tests
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Fri, 26 Mar 2010 17:02:36 +0100 |
parents | 65a90c8e11ee |
children | a9702c47a19f |
line wrap: on
line source
updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../a searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) pushing to ../a searching for changes abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) pushing to ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files adding foo updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging foo 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) pushing to ../c searching for changes abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) 1 pushing to ../c searching for changes no changes found 0 pushing to ../c searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) 1 pushing to ../c searching for changes abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) 1 pushing to ../c searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+2 heads) 0 pushing to ../c searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) 0 pushing to ../e searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 0 pushing to ../e searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 0 % issue 736 % push on existing branch and new branch pushing to ../f searching for changes abort: push creates new remote branches: c! (use 'hg push -f' to force) 1 pushing to ../f searching for changes abort: push creates new remote branches: c! (use 'hg push -f' to force) 1 % multiple new branches pushing to ../f searching for changes abort: push creates new remote branches: c, d! (use 'hg push -f' to force) 1 pushing to ../f searching for changes abort: push creates new remote branches: c, d! (use 'hg push -f' to force) 1 % fail on multiple head push pushing to ../f searching for changes abort: push creates new remote heads on branch 'a'! (you should pull and merge or use push -f to force) 1 % push replacement head on existing branches pushing to ../f searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files 0 % merge of branch a to other branch b followed by unrelated push on branch a pushing to ../f searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (-1 heads) 0 pushing to ../f searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 0 % cheating the counting algorithm pushing to ../f searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files 0 % checking prepush logic does not allow silently pushing multiple new heads adding init adding a updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b created new head 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding c created new head pushing to h searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) % check prepush logic with merged branches marked working directory as branch a adding foo updating to branch a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) pushing to j searching for changes abort: push creates new remote branches: b! (use 'hg push -f' to force) % prepush -r should not allow you to sneak in new heads pushing to ../l searching for changes abort: push creates new remote heads on branch 'a'! (did you forget to merge? use push -f to force)