view tests/test-rebase-keep-branch.out @ 12498:4846e8cd9327

keyword: support rollback by restoring expansion to previous values

Prevent spurious differences in the working directory
after a rollback.

Add tests for several rollback situations.

0 files updated, 0 files merged, 2 files removed, 0 files unresolved
marked working directory as branch notdefault
@  4:r1:notdefault
|
| o  3:l2:
| |
| o  2:l1:
|/
o  1:c2:
|
o  0:c1:


% Rebase a branch while preserving the branch name
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
@  4:r1:notdefault
|
o  3:l2:
|
o  2:l1:
|
o  1:c2:
|
o  0:c1:

% dirstate branch should be "notdefault"
notdefault