[PATCH stable] convert: make filemap renames consistently override revision renames
Patrick Mézard
patrick at mezard.eu
Mon Jul 9 09:01:42 CDT 2012
Le 06/07/12 16:43, Wagner Bruna a écrit :
> # HG changeset patch
> # User Wagner Bruna <wbruna at yahoo.com>
> # Date 1341548042 10800
> # Branch stable
> # Node ID 1fb06274e835cd79c8fa175a82bfc3bcf70bb606
> # Parent b3f005d3105aa3c771051862d150462872bce522
> convert: make filemap renames consistently override revision renames
>
> When the source repository had a revision renaming "$new -> $old",
> but the filemap a "$old -> $new" rename, the converted revision could
> use either $new (deleting the file) or $old (keeping the file) when
> getting the file data, depending on the lexicographical order of
> those names. So the resulting revision would leave some files
> untouched (as expected), but delete others arbitrarely.
+1
--
Patrick Mézard
More information about the Mercurial-devel
mailing list