view tests/test-issue1306.out @ 7566:5f7e3f17aece

mq: drop copy records when refreshing regular patches (issue1441)

Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.

Reported by Gary Bernhardt

% initialize remote repo with branches
adding a
marked working directory as branch br
adding c
changeset:   2:1630aed6ed2b
branch:      br
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

changeset:   1:234f53e6c5ff
branch:      br
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

% try cloning -r branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   2:1630aed6ed2b
branch:      br
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

% try cloning -rother clone#branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   0:cb9a9f314b8b
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

% try cloning -r1 clone#branch
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   1:234f53e6c5ff
branch:      br
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b