| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: ensure that we always commit the mergestate
|
file |
diff |
annotate
|
| Thu, 05 Oct 2017 08:03:57 -0700 |
Mark Thomas |
merge: improve comments in mergestate._makerecords
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when merging (issue5628)
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: improve error messages for path conflicts during update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when updating (issue5628)
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: rename conflicts to fileconflicts in _checkunknownfiles
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add _checkunknowndirs function for detecting path conflicts
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: backup conflicting directories when getting files
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'pr' to rename files during update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add merge action 'p' to record path conflicts during update
|
file |
diff |
annotate
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: add pathconflict merge state
|
file |
diff |
annotate
|
| Sun, 08 Oct 2017 21:48:40 +0200 |
Boris Feld |
configitems: register 'merge.checkunknown' and 'merge.checkignored'
|
file |
diff |
annotate
|
| Fri, 29 Sep 2017 15:48:34 +0000 |
Alex Gaynor |
style: never use a space before a colon or comma
|
file |
diff |
annotate
|
| Fri, 30 Jun 2017 03:43:13 +0200 |
Boris Feld |
configitems: register the 'merge.preferancestor' config
|
file |
diff |
annotate
|
| Sat, 30 Sep 2017 15:48:08 +0530 |
Pulkit Goyal |
py3: use pycompat.bytestr instead of str
|
file |
diff |
annotate
|
| Sat, 30 Sep 2017 15:45:15 +0530 |
Pulkit Goyal |
py3: explicitly convert dict.keys() and dict.items() into a list
|
file |
diff |
annotate
|
| Thu, 14 Sep 2017 13:14:32 -0700 |
Phil Cohen |
merge: allow a custom working context to be passed to update
|
file |
diff |
annotate
|
| Tue, 12 Sep 2017 19:27:01 -0700 |
Phil Cohen |
merge: move cwd-missing detection to helper functions
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:17:43 -0700 |
Phil Cohen |
merge: flush any deferred writes just before recordupdates()
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: flush any deferred writes before, and after, running any workers
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: pass wctx to premerge, filemerge
|
file |
diff |
annotate
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
merge: move some of the logic in batchget() to workingfilectx
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 19:27:28 +0000 |
Alex Gaynor |
merge: removed sorting in casefolding detection, for a slight performance win
|
file |
diff |
annotate
|
| Fri, 14 Jul 2017 14:22:40 -0700 |
Jun Wu |
codemod: register core configitems using a script
|
file |
diff |
annotate
|
| Thu, 06 Jul 2017 16:29:31 -0700 |
Gregory Szorc |
sparse: refactor update actions filtering and call from core
|
file |
diff |
annotate
|
| Thu, 06 Jul 2017 14:33:18 -0700 |
Gregory Szorc |
sparse: move pruning of temporary includes into core
|
file |
diff |
annotate
|
| Tue, 01 Dec 2015 09:26:33 -0800 |
Martin von Zweigbergk |
mergestate: implement unresolvedcount() in terms of unresolved()
|
file |
diff |
annotate
|
| Tue, 01 Dec 2015 09:26:10 -0800 |
Martin von Zweigbergk |
mergestate: make unresolved() use iteritems()
|
file |
diff |
annotate
|
| Tue, 04 Jul 2017 22:35:52 -0700 |
Phil Cohen |
workingfilectx: add exists, lexists
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 01:40:34 +0200 |
Pierre-Yves David |
obsutil: move 'foreground' to the new modules
|
file |
diff |
annotate
|