Mercurial > hg

annotate tests/test-issue322.out @ 10014:54cd28258ea7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: add the --change option to display files changed in a revision This option is similar to the one already used for the diff command. Unfortunately, the c and C short option are already used for status, so there is no corresponding short option. However, there is no short option for --rev either, so that's consistent.
author Gilles Moris <gilles.moris@free.fr>
date Mon, 30 Nov 2009 23:51:06 +0100
parents e3dffbdc6522
children
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
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