Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when updating (issue5628)
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: rename conflicts to fileconflicts in _checkunknownfiles
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add _checkunknowndirs function for detecting path conflicts
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: backup conflicting directories when getting files
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'pr' to rename files during update
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'p' to record path conflicts during update
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
commands: update the resolve command to handle path conflicts
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add pathconflict merge state
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add a test demonstrating basic path conflict failures
|
changeset |
files
|
Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
scmutil: handle conflicting files and dirs in origbackuppath
|
changeset |
files
|
Sun, 01 Oct 2017 12:21:50 +0100 |
Yuya Nishihara |
extdata: show debug message if external command exits with non-zero status
|
changeset |
files
|
Sat, 30 Sep 2017 08:57:50 +0100 |
Yuya Nishihara |
templatekw: allow accessing to nested namespace item by its template name
|
changeset |
files
|
Sat, 30 Sep 2017 08:50:24 +0100 |
Yuya Nishihara |
templatekw: get rid of temporary dicts from shownamespaces()
|
changeset |
files
|
Mon, 18 Sep 2017 23:53:05 +0900 |
Yuya Nishihara |
templatekw: rename peerpaths to peerurls per naming convention (BC)
|
changeset |
files
|
Mon, 18 Sep 2017 23:31:01 +0900 |
Yuya Nishihara |
templatekw: make experimental {peerpaths} return a single-level dict (BC)
|
changeset |
files
|
Mon, 18 Sep 2017 23:49:05 +0900 |
Yuya Nishihara |
templatekw: fix scope of peerpath url bound to generator
|
changeset |
files
|
Mon, 18 Sep 2017 23:07:17 +0900 |
Yuya Nishihara |
templater: extend dot operator as a short for get(dict, key)
|
changeset |
files
|
Sat, 09 Sep 2017 19:32:56 +0900 |
Yuya Nishihara |
templater: add dot operator to easily access a sub item
|
changeset |
files
|
Sat, 09 Sep 2017 19:13:25 +0900 |
Yuya Nishihara |
templater: wrap get/min/max result so map operation can apply to element
|
changeset |
files
|
Mon, 02 Oct 2017 07:18:24 +0100 |
Yuya Nishihara |
dispatch: move initialization of sys.std* files
|
changeset |
files
|
Mon, 02 Oct 2017 06:52:10 +0100 |
Yuya Nishihara |
py3: work around the scope of exception variable in dispatch.run()
|
changeset |
files
|
Sat, 07 Oct 2017 22:07:10 +0900 |
Yuya Nishihara |
chg: just forward --time to command server
|
changeset |
files
|
Mon, 09 Oct 2017 02:30:23 -0700 |
Kostia Balytskyi |
windows: add an experimental option for long paths support
|
changeset |
files
|
Sun, 08 Oct 2017 22:07:47 +0200 |
Boris Feld |
configitems: register the 'experimental.graphstyle.grandparent' config
|
changeset |
files
|