Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-encoding.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 | 30d4d8985dd8 |
| children |
line wrap: on
line source
adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (run 'hg update' to get a working copy) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail with encoding error M a ? latin-1 ? latin-1-tag ? utf-8 transaction abort! rollback completed abort: decoding near ' encoded: é': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! % these should work marked working directory as branch é % ascii changeset: 5:db5520b4645f branch: ? tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch changeset: 4:9cff3c980b58 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added tag ? for changeset 770b9b11621d changeset: 3:770b9b11621d tag: ? user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: ? changeset: 2:0572af48b948 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: ? changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': ? = u'\xe9' % latin-1 changeset: 5:db5520b4645f branch: é tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch changeset: 4:9cff3c980b58 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added tag é for changeset 770b9b11621d changeset: 3:770b9b11621d tag: é user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: é changeset: 2:0572af48b948 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: é changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': é = u'\xe9' % utf-8 changeset: 5:db5520b4645f branch: é tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch changeset: 4:9cff3c980b58 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added tag é for changeset 770b9b11621d changeset: 3:770b9b11621d tag: é user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: é changeset: 2:0572af48b948 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: é changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': é = u'\xe9' % ascii tip 5:db5520b4645f ? 3:770b9b11621d % latin-1 tip 5:db5520b4645f é 3:770b9b11621d % utf-8 tip 5:db5520b4645f é 3:770b9b11621d % ascii ? 5:db5520b4645f default 4:9cff3c980b58 (inactive) % latin-1 é 5:db5520b4645f default 4:9cff3c980b58 (inactive) % utf-8 é 5:db5520b4645f default 4:9cff3c980b58 (inactive) % utf-8 changeset: 5:db5520b4645f branch: é tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin1 branch changeset: 4:9cff3c980b58 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added tag é for changeset 770b9b11621d changeset: 3:770b9b11621d tag: é user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: utf-8 e' encoded: é changeset: 2:0572af48b948 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e' encoded: é changeset: 1:0e5b7e3f9c4a user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c' changeset: 0:1e78a93102a3 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: latin-1 e': И = u'\xe9' abort: unknown encoding: dolphin, please check your locale settings abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! abort: branch name not in UTF-8!