| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
overlayworkingctx: inherit from committablectx instead of workingctx
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
overlayworkingctx: add a no-op ``clearunknown()``
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
overlayworkingctx: add _manifest, files(), added(), removed(), modified()
|
| Fri, 08 Dec 2017 12:14:38 -0800 |
Phil Cohen |
rebase: rerun a rebase on-disk if IMM merge conflicts arise
|
| Thu, 07 Dec 2017 22:35:43 -0800 |
Phil Cohen |
rebase: add concludememorynode(), and call it when rebasing in-memory
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass the wctx object (IMM or on-disk) to merge.update
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: do not update if IMM; instead, set the overlaywctx's parents
|
| Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass wctx to rebasenode()
|
| Sat, 09 Dec 2017 00:39:15 +0900 |
Yuya Nishihara |
check-code: allow tabs in heredoc
|
| Fri, 08 Dec 2017 22:27:14 +0800 |
Anton Shestakov |
hgweb: rewrite `template = A and B or C` to be a proper ternary operator
|
| Wed, 06 Dec 2017 18:37:49 -0800 |
Eamonn Kent |
fsmonitor: fsmonitor should send wlock notifications to watchman
|
| Wed, 06 Dec 2017 18:37:49 -0800 |
Eamonn Kent |
fsmonitor: remove watchman transaction and working copy change notifications
|
| Fri, 08 Dec 2017 16:54:59 +0900 |
Matthieu Laneuville |
patch: catch unexpected case in _inlinediff
|
| Fri, 08 Dec 2017 16:47:18 +0900 |
Matthieu Laneuville |
patch: reverse _inlinediff output for consistency
|
