Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-init.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 | 27590c19ad30 |
| children |
line wrap: on
line source
# creating 'local' store created 00changelog.i created revlogv1 store adding foo # creating repo with old format revlogv1 #test failure abort: repository local already exists! # init+push to remote2 comparing with local changeset: 0:c4e059d443be tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: init pushing to ssh://user@dummy/remote2 searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files # clone to remote1 searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files # init to existing repo abort: repository remote1 already exists! abort: could not create remote repo! # clone to existing repo abort: repository remote1 already exists! abort: could not create remote repo! # output of dummyssh Got arguments 1:user@dummy 2:hg init remote2 Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio Got arguments 1:user@dummy 2:hg init remote1 Got arguments 1:user@dummy 2:hg -R remote1 serve --stdio Got arguments 1:user@dummy 2:hg init remote1 Got arguments 1:user@dummy 2:hg init remote1 # comparing repositories 0:c4e059d443be 0:c4e059d443be 0:c4e059d443be # check names for repositories (clashes with URL schemes, special chars) # hg init "bundle" ok # hg init "file" ok # hg init "hg" ok # hg init "http" ok # hg init "https" ok # hg init "old-http" ok # hg init "ssh" ok # hg init "static-http" ok # hg init " " ok # hg init "with space" ok