Mercurial > hg
view tests/test-unrelated-pull @ 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
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 04 Jan 2009 21:32:40 +0100 |
parents | dac4bd67f6c5 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo 123 > a hg add a hg commit -m "a" -u a -d "1000000 0" cd .. mkdir b cd b hg init echo 321 > b hg add b hg commit -m "b" -u b -d "1000000 0" hg pull ../a hg pull -f ../a hg heads