Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch.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 | 6858a7477a5e |
children |
line wrap: on
line source
marked working directory as branch foo foo marked working directory as branch bar % branch shadowing abort: a branch of the same name already exists (use --force to override) marked working directory as branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo changeset: 5:5f8fb06e083e branch: foo tag: tip parent: 4:4909a3732169 parent: 3:bf1bc2f45e83 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: merge changeset: 4:4909a3732169 branch: foo parent: 1:b699b1cec9c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: modify a branch changeset: 3:bf1bc2f45e83 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: clear branch name changeset: 2:67ec16bde7f1 branch: bar user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: change branch name changeset: 1:b699b1cec9c2 branch: foo user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add branch name changeset: 0:be8523e69bf8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: initial foo 5:5f8fb06e083e default 3:bf1bc2f45e83 (inactive) bar 2:67ec16bde7f1 (inactive) foo default bar % test for invalid branch cache rolling back last transaction changeset: 4:4909a3732169 branch: foo tag: tip parent: 1:b699b1cec9c2 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: modify a branch Invalid branch cache: unknown tip changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f branch: foo tag: tip parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31 parent: -1:0000000000000000000000000000000000000000 manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a user: test date: Mon Jan 12 13:46:40 1970 +0000 files: a extra: branch=foo description: modify a branch 4:4909a3732169 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo 67ec16bde7f1575d523313b9bca000f6a6f12dca bar % update with no arguments: tipmost revision of the current branch bf1bc2f45e83 4909a3732169 (foo) tip marked working directory as branch foobar abort: branch foobar not found % fastforward merge marked working directory as branch ff adding ff 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) foo changeset: 6:f0c74f92a385 branch: foo tag: tip parent: 4:4909a3732169 parent: 5:c420d2121b71 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Merge ff into foo a ff