Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rawcommit1.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 | 10b6fc51f672 |
children | 8feb33c2d153 |
rev | line source |
---|---|
444 | 1 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
2 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | |
1657
dbb8bba48510
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents:
993
diff
changeset
|
3 (the rawcommit command is deprecated) |
444 | 4 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
5 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | |
6 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1657
diff
changeset
|
7 changeset: 2:e110db3db549 |
444 | 8 tag: tip |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
9 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:
1657
diff
changeset
|
10 date: Mon Jan 12 13:46:40 1970 +0000 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
11 files: c |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
12 description: |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
13 2 |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
14 |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
15 |
1657
dbb8bba48510
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents:
993
diff
changeset
|
16 (the rawcommit command is deprecated) |
444 | 17 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
18 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
19 changeset: 3:20652cf30cc0 |
444 | 20 tag: tip |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
21 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:
1657
diff
changeset
|
22 date: Mon Jan 12 13:46:40 1970 +0000 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
23 files: b |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
24 description: |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
25 3 |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
26 |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
27 |
1657
dbb8bba48510
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents:
993
diff
changeset
|
28 (the rawcommit command is deprecated) |
444 | 29 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
30 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
31 changeset: 4:42556b925639 |
444 | 32 tag: tip |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
33 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:
1657
diff
changeset
|
34 date: Mon Jan 12 13:46:40 1970 +0000 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
35 files: a |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
36 description: |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
37 4 |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
38 |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
39 |
1657
dbb8bba48510
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents:
993
diff
changeset
|
40 (the rawcommit command is deprecated) |
444 | 41 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
42 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b | |
43 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c | |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
44 changeset: 4:42556b925639 |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
45 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:
1657
diff
changeset
|
46 date: Mon Jan 12 13:46:40 1970 +0000 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
47 files: a |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
48 description: |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
49 4 |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
50 |
444 | 51 |
1657
dbb8bba48510
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents:
993
diff
changeset
|
52 (the rawcommit command is deprecated) |
444 | 53 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
54 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
55 changeset: 6:8a0c9254b0ab |
444 | 56 tag: tip |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
57 parent: 4:42556b925639 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1657
diff
changeset
|
58 parent: 5:f56d4c64ab98 |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
59 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:
1657
diff
changeset
|
60 date: Mon Jan 12 13:46:40 1970 +0000 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
61 description: |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
62 6 |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
63 |
444 | 64 |
1657
dbb8bba48510
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com>
parents:
993
diff
changeset
|
65 (the rawcommit command is deprecated) |
444 | 66 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
67 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c | |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
68 changeset: 7:a5a6e1f312b9 |
444 | 69 tag: tip |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
70 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:
1657
diff
changeset
|
71 date: Mon Jan 12 13:46:40 1970 +0000 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
72 description: |
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
73 7 |
444 | 74 |
3375
9fe62e2db71d
rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1933
diff
changeset
|
75 |