Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull.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 | 2d545b98a7bc |
children | e3a0c092b4e2 |
rev | line source |
---|---|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
642
diff
changeset
|
1 adding foo |
336 | 2 checking changesets |
3 checking manifests | |
4 crosschecking files in changesets and manifests | |
5 checking files | |
6 1 files, 1 changesets, 1 total revisions | |
7 requesting all changes | |
8 adding changesets | |
9 adding manifests | |
775 | 10 adding file changes |
11 added 1 changesets with 1 changes to 1 files | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
336 | 13 checking changesets |
14 checking manifests | |
15 crosschecking files in changesets and manifests | |
16 checking files | |
17 1 files, 1 changesets, 1 total revisions | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
18 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
336 | 19 foo |
20 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | |
522
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
350
diff
changeset
|
21 pulling from http://localhost:20059/ |
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
350
diff
changeset
|
22 searching for changes |
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
350
diff
changeset
|
23 no changes found |
4888
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
24 % issue 622 |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
25 pulling from ../test |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
26 requesting all changes |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
27 adding changesets |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
28 adding manifests |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
29 adding file changes |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
30 added 1 changesets with 1 changes to 1 files |
2d545b98a7bc
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com>
parents:
2955
diff
changeset
|
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |