view tests/test-issue660.out @ 10251:a19d2993385d stable

subrepo: fix merging of already merged subrepos (issue1986)

This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.

In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.

Test provided by Steve Losh.

adding a
adding b/b
% file replaced with directory
% should fail - would corrupt dirstate
abort: file 'a' in dirstate clashes with 'a/a'
% removing shadow
% should succeed - shadow removed
% directory replaced with file
% should fail - would corrupt dirstate
abort: directory 'b' already in dirstate
% removing shadow
% should succeed - shadow removed
% look what we got
A a/a
A b
R a
R b/b
% revert reintroducing shadow - should fail
abort: file 'b' in dirstate clashes with 'b/b'
% revert all - should succeed
undeleting a
forgetting a/a
forgetting b
undeleting b/b
% addremove
removing a
adding a/a
adding b
removing b/b
A a/a
A b
R a
R b/b
% commit
C a/a
C b
% long directory replaced with file
adding d/d/d
% should fail - would corrupt dirstate
abort: directory 'd' already in dirstate
% removing shadow
% should succeed - shadow removed
% update should work at least with clean workdir
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
C a
C b/b
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
C a/a
C b