Show More
@@ -56,8 +56,8 b" def fetch(ui, repo, source='default', **" | |||
|
56 | 56 | except error.RepoLookupError: |
|
57 | 57 | branchnode = None |
|
58 | 58 | if parent != branchnode: |
|
59 |
raise util.Abort(_('working directory not at branch tip |
|
|
60 |
|
|
|
59 | raise util.Abort(_('working directory not at branch tip'), | |
|
60 | hint=_('use "hg update" to check out branch tip')) | |
|
61 | 61 | |
|
62 | 62 | wlock = lock = None |
|
63 | 63 | try: |
@@ -339,7 +339,8 b' pull in change on different branch than ' | |||
|
339 | 339 | marked working directory as branch topic |
|
340 | 340 | (branches are permanent and global, did you want a bookmark?) |
|
341 | 341 | $ hg -R n2 fetch -m merge n1 |
|
342 |
abort: working directory not at branch tip |
|
|
342 | abort: working directory not at branch tip | |
|
343 | (use "hg update" to check out branch tip) | |
|
343 | 344 | [255] |
|
344 | 345 | |
|
345 | 346 | parent should be 0 (fetch did not update or merge anything) |
General Comments 0
You need to be logged in to leave comments.
Login now