[PATCH 5 of 8] Fix for issue 750 (Revisions with case-only renames ...)
mpm at selenic.com
Thu May 1 13:18:26 CDT 2008
On Wed, 2008-04-30 at 18:37 +0100, Paul Moore wrote:
> # HG changeset patch
> # User "Paul Moore <p.f.moore at gmail.com>"
> # Date 1209573973 -3600
> # Node ID 114727a7ad5604c8c31324ebb431b372eec73061
> # Parent c7ddd7a0bf7b980bf39ccd206cf19ca86f95f281
> Fix for issue 750 (Revisions with case-only renames ...)
> This patch ensures that case-only renames are merged correctly by sorting the
> merge actions case insensitively on filename, and then making sure removes
> sort before fetches (so that the remove of the old case does not remove the
> newly-fetched new case).
Is this actually still necessary? The new merge code stashes a copy of
every file to be merged before anything else happens so that file merges
can be retried.
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel