Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-no-symlinks.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 | fc6106267198 |
children |
rev | line source |
---|---|
5126
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % unbundle |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 a |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 d/b |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 % move and copy |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 a |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 d/b |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 % bundle |
5134
9b5ae133bd5a
test-no-symlinks: rename .bundle into .hg for consistency.
Patrick Mezard <pmezard@gmail.com>
parents:
5126
diff
changeset
|
9 pulling from ../symlinks.hg |
5126
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 requesting all changes |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 adding changesets |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 adding manifests |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 adding file changes |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 added 2 changesets with 6 changes to 6 files |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 (run 'hg update' to get a working copy) |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
16 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 a |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 a |
dcfd75502b82
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 d/b |