Mercurial > hg
comparison mercurial/discovery.py @ 15513:646759147717
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 17 Nov 2011 16:53:17 -0600 |
| parents | fa47291b3f1f 9bea3aed6ee1 |
| children | cff25e4b37d2 |
comparison
equal
deleted
inserted
replaced
| 15510:5414b56cfad6 | 15513:646759147717 |
|---|---|
| 176 "use push -f to force") | 176 "use push -f to force") |
| 177 else: | 177 else: |
| 178 hint = _("did you forget to merge? " | 178 hint = _("did you forget to merge? " |
| 179 "use push -f to force") | 179 "use push -f to force") |
| 180 if branch is not None: | 180 if branch is not None: |
| 181 repo.ui.note("new remote heads on branch '%s'\n" % branch) | 181 repo.ui.note(_("new remote heads on branch '%s'\n") % branch) |
| 182 for h in dhs: | 182 for h in dhs: |
| 183 repo.ui.note("new remote head %s\n" % short(h)) | 183 repo.ui.note(_("new remote head %s\n") % short(h)) |
| 184 if error: | 184 if error: |
| 185 raise util.Abort(error, hint=hint) | 185 raise util.Abort(error, hint=hint) |
| 186 | 186 |
| 187 # 6. Check for unsynced changes on involved branches. | 187 # 6. Check for unsynced changes on involved branches. |
| 188 if unsynced: | 188 if unsynced: |