Mercurial > evolve

diff tests/test-simple4server.t @ 1576:526253198860

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: handle merge commit with single obsolete parent (issue4389) This handles evolving merge commits with a single obsolete parent. Merge commits with two obsolete parents are still unsupported. Note this depends on a change to merge.graft in core. Older versions of mercurial will not have this functionality. Also, test-unstable.t will fail with older versions.
author Andrew Halberstadt <ahalberstadt@mozilla.com>
date Thu, 26 Nov 2015 20:38:31 -0500
parents 97b9141cbf72
children e359d33856c3 d3429d25e0cb
line wrap: on
line diff