Mercurial > evolve

diff README @ 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 25254b2f8116
children 6079dcbfb726
line wrap: on
line diff
--- a/README	Tue Dec 22 14:11:09 2015 +0000
+++ b/README	Thu Nov 26 20:38:31 2015 -0500
@@ -62,6 +62,7 @@
 - tests: drop our copy of 'run-tests.py' use core one instead,
 - bookmark: do all bookmark movement within a transaction.
 - evolve: compatibility with Mercurial 3.7
+- evolve: support merge with a single obsolete parent.
 
 5.2.2 --