Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-parents.out @ 5278:70e9a527cc61
convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 01 Sep 2007 02:49:18 -0300 |
parents | be5dc5e3ab2d |
children | 5a4824f6665c |
line wrap: on
line source
% no working directory adding a adding b % hg parents changeset: 2:6cfac479f009 tag: tip user: test date: Thu Jan 01 00:00:02 1970 +0000 summary: b % hg parents a changeset: 0:b6a1406d8886 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: ab % hg parents -r 2 changeset: 1:d786049f033a user: test date: Thu Jan 01 00:00:01 1970 +0000 summary: a % hg parents -r 2 a changeset: 0:b6a1406d8886 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: ab % hg parents -r 2 ../a abort: ../a not under root % cd dir; hg parents -r 2 ../a changeset: 0:b6a1406d8886 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: ab % hg parents -r 2 path:a changeset: 0:b6a1406d8886 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: ab % hg parents -r 2 glob:a abort: can only specify an explicit file name