Mercurial > hg
comparison tests/test-push-warn.out @ 3684:975c2469c316
correct remote heads test in prepush
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 19 Nov 2006 16:32:36 -0600 |
parents | 092039246d73 |
children | 2aef481ac73c |
comparison
equal
deleted
inserted
replaced
3683:b0fd43effdb3 | 3684:975c2469c316 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2 pushing to ../a | 2 pushing to ../a |
3 searching for changes | 3 searching for changes |
4 abort: unsynced remote changes! | 4 abort: push creates new remote branches! |
5 (did you forget to sync? use push -f to force) | 5 (did you forget to merge? use push -f to force) |
6 pulling from ../a | 6 pulling from ../a |
7 searching for changes | 7 searching for changes |
8 adding changesets | 8 adding changesets |
9 adding manifests | 9 adding manifests |
10 adding file changes | 10 adding file changes |
36 pushing to ../c | 36 pushing to ../c |
37 searching for changes | 37 searching for changes |
38 no changes found | 38 no changes found |
39 pushing to ../c | 39 pushing to ../c |
40 searching for changes | 40 searching for changes |
41 abort: push creates new remote branches! | |
42 (did you forget to merge? use push -f to force) | |
43 pushing to ../c | |
44 searching for changes | |
41 adding changesets | 45 adding changesets |
42 adding manifests | 46 adding manifests |
43 adding file changes | 47 adding file changes |
44 added 2 changesets with 2 changes to 1 files (+2 heads) | 48 added 2 changesets with 2 changes to 1 files (+2 heads) |
45 pushing to ../c | 49 pushing to ../c |