Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge7.out @ 5210:90d9ec0dc69d
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 23 Aug 2007 01:48:29 -0300 |
parents | 93a4e72b4f83 |
children | 17ed9b9a0d03 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test-a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) warning: conflicts during merge. merging test.txt merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2 pulling from ../test-a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) warning: conflicts during merge. resolving manifests overwrite None partial False ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 test.txt: versions differ -> m merging test.txt my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 3 hg merge 4 one <<<<<<< my two-point-five ======= two-point-one >>>>>>> other three rev offset length base linkrev nodeid p1 p2 0 0 7 0 0 01365c4cca56 000000000000 000000000000 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 changeset: 4:a070d41e8360 tag: tip parent: 2:faaea63e63a9 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: two -> two-point-one changeset: 3:451c744aabcc parent: 1:e409be6afcc0 parent: 2:faaea63e63a9 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Merge 1 changeset: 2:faaea63e63a9 parent: 0:095c92b91f1a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Numbers as words changeset: 1:e409be6afcc0 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 -> 2.5 changeset: 0:095c92b91f1a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Initial