2005-10-26 02:54:44 +04:00
|
|
|
%%% should show a removed and b added
|
|
|
|
A b
|
|
|
|
R a
|
|
|
|
reverting...
|
2006-03-31 22:37:25 +04:00
|
|
|
undeleting a
|
2006-04-03 21:02:09 +04:00
|
|
|
forgetting b
|
2005-10-26 02:54:44 +04:00
|
|
|
%%% should show b unknown and a back to normal
|
|
|
|
? b
|
2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2005-10-26 02:54:44 +04:00
|
|
|
merging a
|
2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2005-10-26 02:54:44 +04:00
|
|
|
%%% should show foo-b
|
|
|
|
foo-b
|
|
|
|
%%% should show a removed and b added
|
|
|
|
A b
|
|
|
|
R a
|
2006-05-05 21:45:08 +04:00
|
|
|
%%% revert should fail
|
2006-09-15 06:24:00 +04:00
|
|
|
abort: uncommitted merge - please provide a specific revision
|
2006-05-05 21:45:08 +04:00
|
|
|
%%% revert should be ok now
|
2006-03-31 22:37:25 +04:00
|
|
|
undeleting a
|
2006-04-03 21:02:09 +04:00
|
|
|
forgetting b
|
2005-10-26 02:54:44 +04:00
|
|
|
%%% should show b unknown and a marked modified (merged)
|
2008-03-18 10:07:39 +03:00
|
|
|
M a
|
2005-10-26 02:54:44 +04:00
|
|
|
? b
|
|
|
|
%%% should show foo-b
|
|
|
|
foo-b
|