[Bug 6690] New: Unexpected conflicts during evolve involving copies.

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=6690

            Bug ID: 6690
           Summary: Unexpected conflicts during evolve involving copies.
           Product: Mercurial
           Version: 6.1.1
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: sebunger44 at gmail.com
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org
    Python Version: ---

Created attachment 2146
  --> https://bz.mercurial-scm.org/attachment.cgi?id=2146&action=edit
Script to reproduce conflict issue.

I recently upgraded from Ubuntu focal with a locally maintained mercurial 5.5.2
+ evolve 10.0.2 to Ubuntu jammy with the Ubuntu-supplied mercurial 6.1.1 and a
locally supplied evolve 10.5.1 (same result also with 10.5.0).

After the upgrade we started getting conflicts in evolutions that involve
copies of files but that should not produce any conflicts. The same operations
using the previous versions of mercurial and evolve do not produce conflicts.

I have attached as minimal a reproduction script as I could.

WARNING: The script will *delete* and recreate a folder named copyrebaseexample
in the current directory when run. Make sure you don't have one you don't want
to loose before running it.

-- 
You are receiving this mail because:
You are on the CC list for the bug.