tests/test-confused-revert.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 16 Mar 2007 22:48:20 -0300
changeset 4233 03a665f9f913
parent 3092 25857e00af8e
permissions -rw-r--r--
util._matcher: use "." as the root of empty {rel,}path patterns Should fix issue332. Really.

%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a back to normal
? b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
%%% revert should fail
abort: uncommitted merge - please provide a specific revision
%%% revert should be ok now
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b