Show More
@@ -416,7 +416,8 b' def backout(ui, repo, node=None, rev=Non' | |||
|
416 | 416 | |
|
417 | 417 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
418 | 418 | |
|
419 |
Returns 0 on success, 1 if there are unresolved |
|
|
419 | Returns 0 on success, 1 if nothing to backout or there are unresolved | |
|
420 | files. | |
|
420 | 421 | ''' |
|
421 | 422 | if rev and node: |
|
422 | 423 | raise util.Abort(_("please specify just one revision")) |
@@ -495,6 +496,9 b' def backout(ui, repo, node=None, rev=Non' | |||
|
495 | 496 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
496 | 497 | match, editor=e) |
|
497 | 498 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
499 | if not newnode: | |
|
500 | ui.status(_("nothing changed\n")) | |
|
501 | return 1 | |
|
498 | 502 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
499 | 503 | |
|
500 | 504 | def nice(node): |
@@ -409,6 +409,22 b' on branch1, so no file1 and file2:' | |||
|
409 | 409 | |
|
410 | 410 | $ cd .. |
|
411 | 411 | |
|
412 | backout of empty changeset (issue4190) | |
|
413 | ||
|
414 | $ hg init emptycommit | |
|
415 | $ cd emptycommit | |
|
416 | ||
|
417 | $ touch file1 | |
|
418 | $ hg ci -Aqm file1 | |
|
419 | $ hg branch -q branch1 | |
|
420 | $ hg ci -qm branch1 | |
|
421 | $ hg backout -v 1 | |
|
422 | resolving manifests | |
|
423 | nothing changed | |
|
424 | [1] | |
|
425 | ||
|
426 | $ cd .. | |
|
427 | ||
|
412 | 428 | |
|
413 | 429 | Test usage of `hg resolve` in case of conflict |
|
414 | 430 | (issue4163) |
General Comments 0
You need to be logged in to leave comments.
Login now