Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy.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 | c0b449154a90 |
children |
rev | line source |
---|---|
363 | 1 A b |
2 b | |
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
1043 | 4 we should see two history entries |
2973
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2223
diff
changeset
|
5 changeset: 1:386a3cc01532 |
1043 | 6 tag: tip |
7 user: test | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
8 date: Mon Jan 12 13:46:40 1970 +0000 |
1043 | 9 files: b |
10 description: | |
11 2 | |
12 | |
13 | |
2973
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2223
diff
changeset
|
14 changeset: 0:33aaa84a386b |
1043 | 15 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
16 date: Mon Jan 12 13:46:40 1970 +0000 |
1043 | 17 files: a |
18 description: | |
19 1 | |
20 | |
21 | |
22 we should see one log entry for a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
23 changeset: 0:33aaa84a386b |
1043 | 24 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
25 date: Mon Jan 12 13:46:40 1970 +0000 |
1043 | 26 summary: 1 |
27 | |
28 this should show a revision linked to changeset 0 | |
29 rev offset length base linkrev nodeid p1 p2 | |
30 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 | |
31 we should see one log entry for b | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
32 changeset: 1:386a3cc01532 |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
33 tag: tip |
363 | 34 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1044
diff
changeset
|
35 date: Mon Jan 12 13:46:40 1970 +0000 |
363 | 36 summary: 2 |
37 | |
1043 | 38 this should show a revision linked to changeset 1 |
39 rev offset length base linkrev nodeid p1 p2 | |
40 0 0 65 0 1 9a263dd772e0 000000000000 000000000000 | |
41 this should show the rename information in the metadata | |
42 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
43 copy: a | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2973
diff
changeset
|
44 ed156f22f0a6fde642de0b5eba0cbbb2 .hg/store/data/b.i |
925 | 45 60b725f10c9c85c70d97880dfe8191b3 bsum |
46 60b725f10c9c85c70d97880dfe8191b3 asum | |
363 | 47 checking changesets |
48 checking manifests | |
49 crosschecking files in changesets and manifests | |
50 checking files | |
51 2 files, 2 changesets, 2 total revisions |