Mercurial > hg
comparison tests/test-backout.t @ 20872:3f83fc5cfe71 stable 2.9.2
backout: correct commit status of no changes made (BC) (issue4190)
If backout generated no changes to commit, it showed wrong status, "changeset
<target> backs out changeset <target>", and raised TypeError with -v option.
This changes the return code to 1, which is the same as "hg commit" and
"hg rebase".
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 08 Mar 2014 18:52:16 +0900 |
parents | ba619c50a355 |
children | cc62c9d6887a |
comparison
equal
deleted
inserted
replaced
20871:e01cff65f4c5 | 20872:3f83fc5cfe71 |
---|---|
404 parent: 1:bf1602f437f3 | 404 parent: 1:bf1602f437f3 |
405 file1 | 405 file1 |
406 branch: branch1 | 406 branch: branch1 |
407 commit: (clean) | 407 commit: (clean) |
408 update: (current) | 408 update: (current) |
409 | |
410 $ cd .. | |
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] | |
409 | 425 |
410 $ cd .. | 426 $ cd .. |
411 | 427 |
412 | 428 |
413 Test usage of `hg resolve` in case of conflict | 429 Test usage of `hg resolve` in case of conflict |