Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add test for path conflicts during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
context: also consider path conflicts when clearing unknown files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when merging (issue5628)
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
util: add safename function for generating safe names to rename to
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: improve error messages for path conflicts during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when updating (issue5628)
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: rename conflicts to fileconflicts in _checkunknownfiles
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add _checkunknowndirs function for detecting path conflicts
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: backup conflicting directories when getting files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'pr' to rename files during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'p' to record path conflicts during update
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
commands: update the resolve command to handle path conflicts
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add pathconflict merge state
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add a test demonstrating basic path conflict failures
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
scmutil: handle conflicting files and dirs in origbackuppath
|