Hello, When a file is copied and then renamed in the same commit we get the "detected divergent renames" warning at each further pulls. Expected behavior is either no warning at all or forbid the copy+rename in the same transaction. Related question : how to solve the issue ? Please find below a use case to reproduce the problem. Thank you very much for your help ! Cheers, Charles-Henri. # Test case using mercurial 1.5 hg init test cd test touch a hg commit -A -m "add a" cd .. hg clone test test_copy_rename cd test_copy_rename hg cp a b hg rename a c hg commit -m "copy rename in one transaction" cd ../test hg pull -u ../test_copy_rename pulling from ../test_copy_rename searching for changes adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files warning: detected divergent renames of a to: b c 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
Confirmed in 1.7
--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:07 EDT --- This bug was previously known as _bug_ 2113 at http://mercurial.selenic.com/bts/issue2113
I pushed a fix to this to crew: http://hg.intevation.org/mercurial/crew/rev/ad394c897b16
In main.
Fixed in stable by ad394c897b16 merge: do not warn about copy and rename in the same transaction
I guess we can go to resolved here. I noticed this problem in some situations, but they were always with 2.2.x, not 2.3-rc. When doing the same steps with 2.3-rc, the warning did not happen.