##// END OF EJS Templates
merge: avoid double deletion mentioned in issue636
merge: avoid double deletion mentioned in issue636

File last commit:

r4894:be5dc5e3 default
r5059:8d9bdcbb default
Show More
test-parents.out
44 lines | 941 B | text/plain | TextLexer
% 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