test-push-warn.out
172 lines
| 4.6 KiB
| text/plain
|
TextLexer
/ tests / test-push-warn.out
|
r9611 | updating to branch default | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r816 | pushing to ../a | ||
searching for changes | ||||
|
r6181 | abort: push creates new remote heads! | ||
|
r3684 | (did you forget to merge? use push -f to force) | ||
|
r816 | pulling from ../a | ||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r1043 | added 1 changesets with 1 changes to 1 files (+1 heads) | ||
|
r2019 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
|
r816 | pushing to ../a | ||
searching for changes | ||||
|
r6181 | abort: push creates new remote heads! | ||
|
r816 | (did you forget to merge? use push -f to force) | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r816 | pushing to ../a | ||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r7460 | added 2 changesets with 1 changes to 1 files | ||
|
r2021 | adding foo | ||
|
r9611 | updating to branch default | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r6336 | created new head | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r2021 | merging foo | ||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r2021 | pushing to ../c | ||
searching for changes | ||||
|
r6181 | abort: push creates new remote heads! | ||
|
r2021 | (did you forget to merge? use push -f to force) | ||
|
r6098 | 1 | ||
|
r2021 | pushing to ../c | ||
searching for changes | ||||
no changes found | ||||
|
r3803 | 0 | ||
|
r2021 | pushing to ../c | ||
searching for changes | ||||
|
r6181 | abort: push creates new remote heads! | ||
|
r3684 | (did you forget to merge? use push -f to force) | ||
|
r6098 | 1 | ||
|
r3803 | pushing to ../c | ||
searching for changes | ||||
|
r6181 | abort: push creates new remote heads! | ||
|
r3803 | (did you forget to merge? use push -f to force) | ||
|
r6098 | 1 | ||
|
r3684 | pushing to ../c | ||
searching for changes | ||||
|
r2109 | adding changesets | ||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 1 files (+2 heads) | ||||
|
r3803 | 0 | ||
|
r2021 | pushing to ../c | ||
searching for changes | ||||
|
r2109 | adding changesets | ||
adding manifests | ||||
adding file changes | ||||
|
r2424 | added 1 changesets with 1 changes to 1 files (-1 heads) | ||
|
r3803 | 0 | ||
|
r3923 | 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 | ||||
|
r8565 | % issue 736 | ||
% push on existing branch and new branch | ||||
pushing to ../f | ||||
searching for changes | ||||
|
r10354 | 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: 'd'! | ||||
(use 'hg push -f' to force) | ||||
|
r8565 | 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 | ||||
|
r9479 | % checking prepush logic does not allow silently pushing multiple new heads | ||
adding init | ||||
adding a | ||||
|
r9611 | updating to branch default | ||
|
r9609 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r9479 | adding b | ||
created new head | ||||
|
r9609 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r9479 | adding c | ||
created new head | ||||
|
r9609 | pushing to h | ||
|
r9479 | searching for changes | ||
abort: push creates new remote heads! | ||||
(did you forget to merge? use push -f to force) | ||||
|
r9954 | % 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 heads! | ||||
(did you forget to merge? use push -f to force) | ||||