Mercurial > hg
comparison mercurial/wireproto.py @ 34549:a991e1d6bc82
merge: backup conflicting directories when getting files
During batchget, if a target file conflicts with a directory, or if the
directory a target file is in conflicts with a file, backup and remove the
conflicting file or directory before performing the get.
Differential Revision: https://phab.mercurial-scm.org/D778
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:05:30 -0700 |
| parents | 10e162bb9bf5 |
| children | 5e61cd5fb0fc |
comparison
equal
deleted
inserted
replaced
| 34548:b4955650eb57 | 34549:a991e1d6bc82 |
|---|