tests/test-merge-revert.out
author mpm@selenic.com
Sat, 13 Aug 2005 19:43:42 -0800
changeset 896 01215ad0428341bf0b5806b199c54fe158d9affd
parent 866 6d6095823b82f32c7d20230c4b7fc18fe6343dae
parent 895 77b52b864249768a0ec615af331be778fdbb65e9
child 925 5a034646e472c1c9e4c5bac0e356b49f009bf74c
permissions -rw-r--r--
Merge with BOS

+ hg init
+ hg add file1 file2
+ hg commit -m added file1 and file2 -d 0 0 -u user
+ hg commit -m changed file1 -d 0 0 -u user
+ hg -q log
1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
0:8633637036c18f021d771208e16ae3508ab81d28
+ hg id
3aa14bbc23d9 tip
+ hg update -C 0
+ hg id
8633637036c1
+ hg id
8633637036c1+
+ hg revert
+ hg diff
+ hg status
+ hg id
8633637036c1
+ hg update
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg update -C 0
+ hg update
merging file1
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg revert
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg revert -r tip
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg update -C
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip