Mercurial: tests/test-issue322.out annotate

annotate tests/test-issue322.out @ 8545:3682a19bb637

merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.

author	Steve Borho <steve@borho.org>
date	Fri, 22 May 2009 11:42:21 -0500
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