Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-issue322.out @ 5126:dcfd75502b82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test symlink handling on platform not supporting them
author Patrick Mezard <pmezard@gmail.com>
date Wed, 08 Aug 2007 22:47:18 +0200
parents 3d5547845158
children e3dffbdc6522
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2953
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
1 % file replaced with directory
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
2 adding a
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
3 % should fail - would corrupt dirstate
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
4 abort: file named 'a' already in dirstate
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
5 % directory replaced with file
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
6 adding a/a
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
7 % should fail - would corrupt dirstate
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
8 abort: directory named 'a' already in dirstate
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
9 % directory replaced with file
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
10 adding b/c/d
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
11 % should fail - would corrupt dirstate
3d5547845158 fix issue 322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
12 abort: directory named 'b' already in dirstate