Show More
@@ -61,7 +61,7 b" def fetch(ui, repo, source='default', **" | |||||
61 | branchnode = None |
|
61 | branchnode = None | |
62 | if parent != branchnode: |
|
62 | if parent != branchnode: | |
63 | raise error.Abort(_('working directory not at branch tip'), |
|
63 | raise error.Abort(_('working directory not at branch tip'), | |
64 |
hint=_(' |
|
64 | hint=_("use 'hg update' to check out branch tip")) | |
65 |
|
65 | |||
66 | wlock = lock = None |
|
66 | wlock = lock = None | |
67 | try: |
|
67 | try: |
@@ -339,7 +339,7 b' pull in change on different branch than ' | |||||
339 | (branches are permanent and global, did you want a bookmark?) |
|
339 | (branches are permanent and global, did you want a bookmark?) | |
340 | $ hg -R n2 fetch -m merge n1 |
|
340 | $ hg -R n2 fetch -m merge n1 | |
341 | abort: working directory not at branch tip |
|
341 | abort: working directory not at branch tip | |
342 |
(use |
|
342 | (use 'hg update' to check out branch tip) | |
343 | [255] |
|
343 | [255] | |
344 |
|
344 | |||
345 | parent should be 0 (fetch did not update or merge anything) |
|
345 | 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