Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue322.out
author NIIMI Satoshi <sa2c@sa2c.net>
Thu, 11 Oct 2007 05:58:54 +0900
changeset 5465 9873cbb134b2
parent 5051 e3dffbdc6522
permissions -rw-r--r--
mercurial.el, mq.el: remove runtime dependencies on CL package * (require 'cl) at compile-time * don't use map()
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
mercurial-crew-with-dirclash