equal
deleted
inserted
replaced
172 "use push -f to force") |
172 "use push -f to force") |
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 if branch is not None: |
176 if branch is not None: |
177 repo.ui.note("new remote heads on branch '%s'\n" % branch) |
177 repo.ui.note(_("new remote heads on branch '%s'\n") % branch) |
178 for h in dhs: |
178 for h in dhs: |
179 repo.ui.note("new remote head %s\n" % short(h)) |
179 repo.ui.note(_("new remote head %s\n") % short(h)) |
180 if error: |
180 if error: |
181 raise util.Abort(error, hint=hint) |
181 raise util.Abort(error, hint=hint) |
182 |
182 |
183 # 6. Check for unsynced changes on involved branches. |
183 # 6. Check for unsynced changes on involved branches. |
184 if unsynced: |
184 if unsynced: |