Show More
@@ -173,9 +173,9 b' def prepush(repo, remote, force, revs, n' | |||||
173 | else: |
|
173 | else: | |
174 | hint = _("did you forget to merge? " |
|
174 | hint = _("did you forget to merge? " | |
175 | "use push -f to force") |
|
175 | "use push -f to force") | |
176 |
repo.ui. |
|
176 | repo.ui.note("new remote heads on branch '%s'\n" % branch) | |
177 | for h in dhs: |
|
177 | for h in dhs: | |
178 |
repo.ui. |
|
178 | repo.ui.note("new remote head %s\n" % short(h)) | |
179 | if error: |
|
179 | if error: | |
180 | raise util.Abort(error, hint=hint) |
|
180 | raise util.Abort(error, hint=hint) | |
181 |
|
181 |
@@ -124,16 +124,22 b'' | |||||
124 | (did you forget to merge? use push -f to force) |
|
124 | (did you forget to merge? use push -f to force) | |
125 | [255] |
|
125 | [255] | |
126 |
|
126 | |||
127 | $ hg push -r 3 -r 4 ../c |
|
127 | $ hg push -v -r 3 -r 4 ../c | |
128 | pushing to ../c |
|
128 | pushing to ../c | |
129 | searching for changes |
|
129 | searching for changes | |
|
130 | all remote heads known locally | |||
|
131 | new remote heads on branch 'default' | |||
|
132 | new remote head a5dda829a167 | |||
|
133 | new remote head ee8fbc7a0295 | |||
130 | abort: push creates new remote head a5dda829a167! |
|
134 | abort: push creates new remote head a5dda829a167! | |
131 | (did you forget to merge? use push -f to force) |
|
135 | (did you forget to merge? use push -f to force) | |
132 | [255] |
|
136 | [255] | |
133 |
|
137 | |||
134 | $ hg push -f -r 3 -r 4 ../c |
|
138 | $ hg push -v -f -r 3 -r 4 ../c | |
135 | pushing to ../c |
|
139 | pushing to ../c | |
136 | searching for changes |
|
140 | searching for changes | |
|
141 | all remote heads known locally | |||
|
142 | 2 changesets found | |||
137 | adding changesets |
|
143 | adding changesets | |
138 | adding manifests |
|
144 | adding manifests | |
139 | adding file changes |
|
145 | adding file changes |
General Comments 0
You need to be logged in to leave comments.
Login now