Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-push-warn.out @ 3797:2aef481ac73c
Don't report an error when closing heads during local push (issue387)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 05 Dec 2006 23:25:28 +0100 |
parents | 975c2469c316 |
children | 27230c29bfec |
comparison
equal
deleted
inserted
replaced
3796:a0d0d24c4e71 | 3797:2aef481ac73c |
---|---|
31 (branch merge, don't forget to commit) | 31 (branch merge, don't forget to commit) |
32 pushing to ../c | 32 pushing to ../c |
33 searching for changes | 33 searching for changes |
34 abort: push creates new remote branches! | 34 abort: push creates new remote branches! |
35 (did you forget to merge? use push -f to force) | 35 (did you forget to merge? use push -f to force) |
36 0 | |
36 pushing to ../c | 37 pushing to ../c |
37 searching for changes | 38 searching for changes |
38 no changes found | 39 no changes found |
40 0 | |
39 pushing to ../c | 41 pushing to ../c |
40 searching for changes | 42 searching for changes |
41 abort: push creates new remote branches! | 43 abort: push creates new remote branches! |
42 (did you forget to merge? use push -f to force) | 44 (did you forget to merge? use push -f to force) |
45 0 | |
46 pushing to ../c | |
47 searching for changes | |
48 abort: push creates new remote branches! | |
49 (did you forget to merge? use push -f to force) | |
50 0 | |
43 pushing to ../c | 51 pushing to ../c |
44 searching for changes | 52 searching for changes |
45 adding changesets | 53 adding changesets |
46 adding manifests | 54 adding manifests |
47 adding file changes | 55 adding file changes |
48 added 2 changesets with 2 changes to 1 files (+2 heads) | 56 added 2 changesets with 2 changes to 1 files (+2 heads) |
57 0 | |
49 pushing to ../c | 58 pushing to ../c |
50 searching for changes | 59 searching for changes |
51 adding changesets | 60 adding changesets |
52 adding manifests | 61 adding manifests |
53 adding file changes | 62 adding file changes |
54 added 1 changesets with 1 changes to 1 files (-1 heads) | 63 added 1 changesets with 1 changes to 1 files (-1 heads) |
64 0 |