Mercurial: tests/test-issue322.out annotate

annotate tests/test-issue322.out @ 9867:81f1462ef2c7

Allow import --no-commit over an applied MQ patch. Since it only changes the working directory, it does not matter whether a patch is applied. This change makes it easier to use hg import --no-commit instead of patch.

author	Brendan Cully <brendan@kublai.com>
date	Mon, 16 Nov 2009 11:31:08 -0800
parents	e3dffbdc6522
children

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
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