Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 8feb33c2d153 |
children |
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 |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
5384
diff
changeset
|
20 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4888
diff
changeset
|
21 pulling from http://localhost/ |
522
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 |