Mercurial > hg
view tests/test-update-branches.out @ 10274:04207f5e7344 stable
mq: Do not translate import message that are appended to commits.
We should not translate the "imported patch" message. The translated message
confuses the detection whether the user has not updated the commit message yet.
We try to avoid to translate generated commit messages.
author | David Soria Parra <dsp@php.net> |
---|---|
date | Wed, 20 Jan 2010 23:23:18 +0100 |
parents | 68a1b9d0663e |
children |
line wrap: on
line source
% initial repo state @ 5:e1bb631146ca b1 | o 4:a4fdb3b883c4 0:b608b9236435 b1 | | o 3:4b57d2520816 1:44592833ba9f | | | | o 2:063f31070f65 | |/ | o 1:44592833ba9f |/ o 0:b608b9236435 % norevtest none clean linear 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=5 % norevtest none clean same 2 abort: crosses branches (use 'hg merge' or use 'hg update -c') parent=2 % revtest none clean linear 1 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 % revtest none clean same 2 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=3 % revtest none clean cross 3 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=4 % revtest none dirty linear 1 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 M foo % revtest none dirty same 2 3 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) parent=2 M foo % revtest none dirty cross 3 4 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) parent=3 M foo % revtest -C dirty linear 1 2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 % revtest -c dirty linear 1 2 abort: uncommitted local changes parent=1 M foo % norevtest -c clean same 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=3 % revtest -cC dirty linear 1 2 abort: cannot specify both -c/--check and -C/--clean parent=1 M foo