Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-parents.out @ 5149:ad6b97132b81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 12 Aug 2007 12:15:10 -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