[Bug 6113] New: content-divergent resolution seems to reset author.

[mercurial-bugs at mercurial-scm.org]

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

            Bug ID: 6113
           Summary: content-divergent resolution seems to reset author.
           Product: Mercurial
           Version: unspecified
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution
          Assignee: bugzilla at mercurial-scm.org
          Reporter: pierre-yves.david at ens-lyon.org
                CC: mercurial-devel at mercurial-scm.org,
                    pierre-yves.david at ens-lyon.org

Givent the current evolution history:

o    3caa4a459439 (13207) tests: use current instability names everywhere
|\
x |  9258f4b20225 (13206) tests: use current instability names everywhere
| |    rewritten(user, date) as 3caa4a459439 using evolve by Pierre-Yves David
<pierre-yves.david at octobus.net> (Fri Apr 05 16:31:45 2019 +0200)
| |
| x  98183abd35b0 (13204) tests: use current instability names everywhere
| |    rewritten(user, date, content) as 3caa4a459439 using evolve by
Pierre-Yves David <pierre-yves.david at octobus.net> (Fri Apr 05 16:31:45 2019
+0200)
| |
x |  417abd3c4f87 (13205) tests: use current instability names everywhere
|/     rewritten(parent) as 9258f4b20225 using evolve by Pierre-Yves David
<pierre-yves.david at octobus.net> (Fri Apr 05 16:31:45 2019 +0200)
|
x  a7cb6c5f5191 (13202) tests: use current instability names everywhere
|
…

And the corresponding commit content:

$ hg log -r 3caa4a459439+9258f4b20225+98183abd35b0 --hidden                    
                                                                     ☿
(phase-cache)
changeset:   13207:3caa4a459439
parent:      13200:046dd7718845
user:        Pierre-Yves David <pierre-yves.david at octobus.net>
date:        Fri Apr 05 16:31:45 2019 +0200
summary:     tests: use current instability names everywhere

changeset:   13206:9258f4b20225
parent:      13200:046dd7718845
user:        Anton Shestakov <av6 at dwimlabs.net>
date:        Thu Apr 04 20:59:50 2019 +0800
obsolete:    rewritten using evolve as 13207:3caa4a459439
summary:     tests: use current instability names everywhere

changeset:   13204:98183abd35b0
parent:      13200:046dd7718845
user:        Anton Shestakov <av6 at dwimlabs.net>
date:        Thu Apr 04 20:59:50 2019 +0800
obsolete:    rewritten using evolve as 13207:3caa4a459439
summary:     tests: use current instability names everywhere

It seems like the automatic content-divergence resolution dropped the initial
author in favor of the user running the content-divergence resolution command.

Writing a proper test for that should not be too hard.

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