view tests/test-confused-revert.out @ 5820:3a1ffc1da32c

Fixed numerous XHTML problems that caused validation errors and warnings.

Link elements for Atom and RSS feeds had no end tag.  <div> block element
inside <a> in-line element isn't right and caused rendering problems on
Safari.  Spurious </div> tag in search forms.  Branch entry missing closing
</a> tag.

%%% 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