| Mon, 09 Oct 2017 10:09:36 -0700 |
Eamonn Kent |
fsmonitor: change the distance calculation
|
changeset |
files
|
| Mon, 09 Oct 2017 16:31:43 +0200 |
Boris Feld |
configitems: update default value of 'phases.new-commit'
|
changeset |
files
|
| Mon, 09 Oct 2017 17:33:03 +0200 |
Boris Feld |
mq: use the newcommitphase utility
|
changeset |
files
|
| Tue, 26 Sep 2017 18:17:47 +0200 |
Denis Laxalde |
patch: rename "header" variable into "hdr" in diff()
|
changeset |
files
|
| Thu, 05 Oct 2017 08:03:57 -0700 |
Mark Thomas |
merge: improve comments in mergestate._makerecords
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
commands: tidy up merge state decoding in resolve
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add test for path conflicts during merge
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
tests: add test for path conflicts during update
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
context: also consider path conflicts when clearing unknown files
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when merging (issue5628)
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
util: add safename function for generating safe names to rename to
|
changeset |
files
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: improve error messages for path conflicts during update
|
changeset |
files
|
| 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
|