Mercurial > hg
view tests/test-merge-revert2.out @ 5250:585471802a01
convert: svn: check for branch movement in any log entry, not just the first.
This fixes, for example,
r4151
D /branches
A /project/branches (from /branches:4150)
A /project/tags (from /tags:4150)
A /project/trunk (from /trunk:4150)
D /tags
D /trunk
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 27 Aug 2007 11:56:53 -0700 |
parents | 93a4e72b4f83 |
children | 3d1f9dcecdea |
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 warning: conflicts during merge. merging file1 merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges with locally modified files. You can redo the full merge using: hg update 0 hg update 1 diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<< my +changed file1 different +======= changed file1 +>>>>>>> other M file1 f248da0d4c3e+ tip reverting file1 f248da0d4c3e tip f248da0d4c3e tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved f248da0d4c3e tip