[PATCH 2 of 2 v2] rebase: fix bug that caused transitive copy records to disappear (issue4192)

Matt Mackall mpm at selenic.com
Tue Jul 1 16:39:40 CDT 2014


On Tue, 2014-06-24 at 14:37 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <raf at durin42.com>
> # Date 1402168992 14400
> #      Sat Jun 07 15:23:12 2014 -0400
> # Node ID 0deae12f924b2d8246d43bedd5c970486fa69491
> # Parent  b7af93b6c0abd7b3fa8e518062d84f8d7690e114
> rebase: fix bug that caused transitive copy records to disappear (issue4192)
> 
> The defect was that copies were always duplicated against the target
> revision, rather than the first parent of the revision being
> rebased. This produced nominally correct results if changes were
> rebased one at a time (or with --collapse), but was wrong if we
> rebased a sequence of changesets which contained a sequence of copies.

These are queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list