[Bug 5996] New: evolve does not propagate changes from originals to copied files, but merge and rebase do

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Thu Oct 4 20:13:34 UTC 2018


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

            Bug ID: 5996
           Summary: evolve does not propagate changes from originals to
                    copied files, but merge and rebase do
           Product: Mercurial
           Version: 4.5.3
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: peter at arrenbrecht.ch
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org

To repro, run:

```
hg init repo
cd repo

echo foo > foo
echo --- >> foo
hg add foo
hg ci -m foo  # rev 0

hg cp foo bar
echo morefoo >> foo
echo morebar >> bar
hg ci -m bar  # rev 1

hg up .^
echo FOO > foo
echo --- >> foo
echo morefoo >> foo
hg amend  # rev 2

hg evolve  # rev 3
```

Now `bar` does not reflect the change to the original `foo`.

For comparison with rebase, run:

```
hg init repo
cd repo

echo foo > foo
echo --- >> foo
hg add foo
hg ci -m foo  # rev 0

hg cp foo bar
echo morefoo >> foo
echo morebar >> bar
hg ci -m bar  # rev 1

hg up 0
echo FOO > foo
echo --- >> foo
echo morefoo >> foo
hg ci -m morefoo  # rev 2

hg rebase --tool internal:merge3 --source 1 --dest tip
```

Now `bar` contains merge conflict markers.

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


More information about the Mercurial-devel mailing list