tests/test-push-warn.out
author Martin Geisler <mg@lazybytes.net>
Fri, 28 Aug 2009 20:28:06 +0200
changeset 9406 a4b761751919
parent 8565 268d16b2ec25
child 9479 f3569d95c2ab
permissions -rw-r--r--
doc/README: rst2man is now in Docutils proper

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pushing to ../a
searching for changes
abort: push creates new remote heads!
(did you forget to merge? 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!
(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 working directory
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!
(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!
(did you forget to merge? use push -f to force)
1
pushing to ../c
searching for changes
abort: push creates new remote heads!
(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 branch 'c'!
(did you forget to merge? use push -f to force)
1
% fail on multiple head push
pushing to ../f
searching for changes
abort: push creates new remote heads!
(did you forget to merge? 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