Mercurial > hg-stable
view tests/test-merge-revert2.out @ 7305:c21d236ca897
hgweb: descend empty directories in web view
When a manifest has a series of directories with nothing in them but a single
directory, displaying the entire chain of empty directories allows for
navigation down to the first non-empty directory with a single click.
Because Java links package hierarchy to directory hierarchy, and because Java
conventions include at least three empty directories at the top of this
hierarchy, descending down empty directories is very common in Java web tools.
author | Ry4an Brase <ry4an-hg@ry4an.org> |
---|---|
date | Mon, 03 Nov 2008 10:20:28 +0100 |
parents | 92ccccb55ba3 |
children | 4c94b6d0fb1c |
line wrap: on
line source
1:f248da0d4c3e 0:9eca13a34789 f248da0d4c3e tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 9eca13a34789 9eca13a34789+ reverting file1 9eca13a34789 1 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file1 warning: conflicts during merge. merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 another line of text +<<<<<<< local +changed file1 different +======= changed file1 +>>>>>>> other M file1 ? file1.orig f248da0d4c3e+ tip reverting file1 ? file1.orig f248da0d4c3e tip ? file1.orig f248da0d4c3e tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig f248da0d4c3e tip