tests/test-issue322.out
author Matt Mackall <mpm@selenic.com>
Mon, 05 Apr 2010 14:33:41 -0500
changeset 10841 7879bff6cacf
parent 5051 e3dffbdc6522
permissions -rw-r--r--
contrib: drop rewrite-revlog
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
5051
e3dffbdc6522 update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2953
diff changeset
     4
abort: file 'a' in dirstate clashes with 'a/a'
2953
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
5051
e3dffbdc6522 update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2953
diff changeset
     8
abort: directory 'a' already in dirstate
2953
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
5051
e3dffbdc6522 update tests output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2953
diff changeset
    12
abort: directory 'b' already in dirstate