tests/test-issue322.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 12 Oct 2006 14:04:11 -0300
changeset 3369 4bad632913d8
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
python2.5 PyArg_ParseTuple fix Python 2.5 doesn't like it when we mix str objects and the "t#" format in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4 and 2.5.
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
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