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
|
Sun, 01 Oct 2017 12:21:50 +0100 |
Yuya Nishihara |
extdata: show debug message if external command exits with non-zero status
|
Sat, 30 Sep 2017 08:57:50 +0100 |
Yuya Nishihara |
templatekw: allow accessing to nested namespace item by its template name
|
Sat, 30 Sep 2017 08:50:24 +0100 |
Yuya Nishihara |
templatekw: get rid of temporary dicts from shownamespaces()
|