Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 5374:e710874247d1
convert: allow the converter_source to say "skip this revision"
If getchanges returns a string, it's assumed to be the id of an
already converted revision. We map the current revision to the same
revision this converted revision was mapped to.
To allow skipping a root revision, getchanges can return the special
string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which
hopefully won't clash with any real id.
The converter_source is responsible for rewriting the parents of the
commit objects to make sure the revision graph makes sense.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | 93a4e72b4f83 |
children |
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