D778: merge: backup conflicting directories when getting files

[ryanmce (Ryan McElroy)]

ryanmce accepted this revision.
ryanmce added a comment.


  lgtm

INLINE COMMENTS

> kiilerix wrote in merge.py:1175
> This seems quite a bit slower. But I guess it never will happen in tight loops? If we have to backup a lot of files, then we have lost anyway?

>   If we have to backup a lot of files, then we have lost anyway?

I think that's essentially the case. The other option here is to always rename conflcting files/directories, but then you end up with unbounded growth in the size of backup files (either in working copy or in some other dir), so that's not really awesome either.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D778

To: mbthomas, #hg-reviewers, ryanmce
Cc: kiilerix, ryanmce, mercurial-devel