##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r9717:68a1b9d0 default
r10244:c4c0502b merge default
Show More
test-update-branches.out
55 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-update-branches.out
Stuart W Marks
update: add comments and test cases for updating across branches...
r9716 % 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
Stuart W Marks
update: allow branch crossing without -c or -C, with no uncommitted changes...
r9717 abort: crosses branches (use 'hg merge' or use 'hg update -c')
Stuart W Marks
update: add comments and test cases for updating across branches...
r9716 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
Stuart W Marks
update: allow branch crossing without -c or -C, with no uncommitted changes...
r9717 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=3
Stuart W Marks
update: add comments and test cases for updating across branches...
r9716 % 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
Stuart W Marks
update: allow branch crossing without -c or -C, with no uncommitted changes...
r9717 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
Stuart W Marks
update: add comments and test cases for updating across branches...
r9716 parent=2
M foo
% revtest none dirty cross 3 4
Stuart W Marks
update: allow branch crossing without -c or -C, with no uncommitted changes...
r9717 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
Stuart W Marks
update: add comments and test cases for updating across branches...
r9716 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