Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-parents.out @ 5340:ad8783fe20f7
darcs2hg: Now detects and recovers from simple darcs conflicts.
author | Terry Smith <terry@t11e.com> |
---|---|
date | Tue, 11 Sep 2007 13:13:54 -0400 |
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