comparison tests/test-push-warn.out @ 11574:6381fa7bfa53

Abort: add a hint argument, printed in the next line inside parenthesis discovery was using a custom made message for this purpose push now returns -1 after aborting, instead of 1 previously
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Jul 2010 14:41:22 +0200
parents b66e414d38b0
children
comparison
equal deleted inserted replaced
11573:7ecf4a082c5f 11574:6381fa7bfa53
35 (branch merge, don't forget to commit) 35 (branch merge, don't forget to commit)
36 pushing to ../c 36 pushing to ../c
37 searching for changes 37 searching for changes
38 abort: push creates new remote heads on branch 'default'! 38 abort: push creates new remote heads on branch 'default'!
39 (did you forget to merge? use push -f to force) 39 (did you forget to merge? use push -f to force)
40 1 40 255
41 pushing to ../c 41 pushing to ../c
42 searching for changes 42 searching for changes
43 no changes found 43 no changes found
44 0 44 0
45 pushing to ../c 45 pushing to ../c
46 searching for changes 46 searching for changes
47 abort: push creates new remote heads on branch 'default'! 47 abort: push creates new remote heads on branch 'default'!
48 (did you forget to merge? use push -f to force) 48 (did you forget to merge? use push -f to force)
49 1 49 255
50 pushing to ../c 50 pushing to ../c
51 searching for changes 51 searching for changes
52 abort: push creates new remote heads on branch 'default'! 52 abort: push creates new remote heads on branch 'default'!
53 (did you forget to merge? use push -f to force) 53 (did you forget to merge? use push -f to force)
54 1 54 255
55 pushing to ../c 55 pushing to ../c
56 searching for changes 56 searching for changes
57 adding changesets 57 adding changesets
58 adding manifests 58 adding manifests
59 adding file changes 59 adding file changes
88 % push on existing branch and new branch 88 % push on existing branch and new branch
89 pushing to ../f 89 pushing to ../f
90 searching for changes 90 searching for changes
91 abort: push creates new remote branches: c! 91 abort: push creates new remote branches: c!
92 (use 'hg push --new-branch' to create new remote branches) 92 (use 'hg push --new-branch' to create new remote branches)
93 1 93 255
94 pushing to ../f 94 pushing to ../f
95 searching for changes 95 searching for changes
96 abort: push creates new remote branches: c! 96 abort: push creates new remote branches: c!
97 (use 'hg push --new-branch' to create new remote branches) 97 (use 'hg push --new-branch' to create new remote branches)
98 1 98 255
99 % multiple new branches 99 % multiple new branches
100 pushing to ../f 100 pushing to ../f
101 searching for changes 101 searching for changes
102 abort: push creates new remote branches: c, d! 102 abort: push creates new remote branches: c, d!
103 (use 'hg push --new-branch' to create new remote branches) 103 (use 'hg push --new-branch' to create new remote branches)
104 1 104 255
105 pushing to ../f 105 pushing to ../f
106 searching for changes 106 searching for changes
107 abort: push creates new remote branches: c, d! 107 abort: push creates new remote branches: c, d!
108 (use 'hg push --new-branch' to create new remote branches) 108 (use 'hg push --new-branch' to create new remote branches)
109 1 109 255
110 % fail on multiple head push 110 % fail on multiple head push
111 pushing to ../f 111 pushing to ../f
112 searching for changes 112 searching for changes
113 abort: push creates new remote heads on branch 'a'! 113 abort: push creates new remote heads on branch 'a'!
114 (did you forget to merge? use push -f to force) 114 (did you forget to merge? use push -f to force)
115 1 115 255
116 % push replacement head on existing branches 116 % push replacement head on existing branches
117 pushing to ../f 117 pushing to ../f
118 searching for changes 118 searching for changes
119 adding changesets 119 adding changesets
120 adding manifests 120 adding manifests
147 % failed push of new named branch 147 % failed push of new named branch
148 pushing to ../f 148 pushing to ../f
149 searching for changes 149 searching for changes
150 abort: push creates new remote branches: e! 150 abort: push creates new remote branches: e!
151 (use 'hg push --new-branch' to create new remote branches) 151 (use 'hg push --new-branch' to create new remote branches)
152 1 152 255
153 % using --new-branch to push new named branch 153 % using --new-branch to push new named branch
154 pushing to ../f 154 pushing to ../f
155 searching for changes 155 searching for changes
156 adding changesets 156 adding changesets
157 adding manifests 157 adding manifests