20 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/d13526333835 changeset: 35309:d13526333835 user: Joerg Sonnenberger <jo...@bec.de> date: Wed Dec 06 15:46:41 2017 +0100 summary: phases: drop the list with phase of each rev, always comput phase sets
https://www.mercurial-scm.org/repo/hg/rev/10cce12fdcd3 changeset: 35310:10cce12fdcd3 user: Matthieu Laneuville <matthieu.laneuvi...@octobus.net> date: Fri Dec 08 16:47:18 2017 +0900 summary: patch: reverse _inlinediff output for consistency https://www.mercurial-scm.org/repo/hg/rev/12ce62c72c24 changeset: 35311:12ce62c72c24 user: Matthieu Laneuville <matthieu.laneuvi...@octobus.net> date: Fri Dec 08 16:54:59 2017 +0900 summary: patch: catch unexpected case in _inlinediff https://www.mercurial-scm.org/repo/hg/rev/73abb81ccb28 changeset: 35312:73abb81ccb28 user: Eamonn Kent <ek...@fb.com> date: Wed Dec 06 18:37:49 2017 -0800 summary: fsmonitor: remove watchman transaction and working copy change notifications https://www.mercurial-scm.org/repo/hg/rev/c67fb3bfe3a1 changeset: 35313:c67fb3bfe3a1 user: Eamonn Kent <ek...@fb.com> date: Wed Dec 06 18:37:49 2017 -0800 summary: fsmonitor: fsmonitor should send wlock notifications to watchman https://www.mercurial-scm.org/repo/hg/rev/1fe3c8296cfe changeset: 35314:1fe3c8296cfe user: Anton Shestakov <a...@dwimlabs.net> date: Fri Dec 08 22:27:14 2017 +0800 summary: hgweb: rewrite `template = A and B or C` to be a proper ternary operator https://www.mercurial-scm.org/repo/hg/rev/e223c0438f89 changeset: 35315:e223c0438f89 user: Yuya Nishihara <y...@tcha.org> date: Sat Dec 09 00:39:15 2017 +0900 summary: check-code: allow tabs in heredoc https://www.mercurial-scm.org/repo/hg/rev/259feddc04e6 changeset: 35316:259feddc04e6 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: rebase: pass wctx to rebasenode() https://www.mercurial-scm.org/repo/hg/rev/5c25fe7fb1e6 changeset: 35317:5c25fe7fb1e6 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: rebase: do not update if IMM; instead, set the overlaywctx's parents https://www.mercurial-scm.org/repo/hg/rev/2bac2d836ce0 changeset: 35318:2bac2d836ce0 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: rebase: pass the wctx object (IMM or on-disk) to merge.update https://www.mercurial-scm.org/repo/hg/rev/228916ca12b5 changeset: 35319:228916ca12b5 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 22:35:43 2017 -0800 summary: rebase: add concludememorynode(), and call it when rebasing in-memory https://www.mercurial-scm.org/repo/hg/rev/d901a88891fe changeset: 35320:d901a88891fe user: Phil Cohen <phil...@fb.com> date: Fri Dec 08 12:14:38 2017 -0800 summary: rebase: rerun a rebase on-disk if IMM merge conflicts arise https://www.mercurial-scm.org/repo/hg/rev/2e1c32a9c97b changeset: 35321:2e1c32a9c97b user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: overlayworkingctx: add _manifest, files(), added(), removed(), modified() https://www.mercurial-scm.org/repo/hg/rev/baf58e621363 changeset: 35322:baf58e621363 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: overlayworkingctx: add a no-op ``clearunknown()`` https://www.mercurial-scm.org/repo/hg/rev/8e1386b342f7 changeset: 35323:8e1386b342f7 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: overlayworkingctx: inherit from committablectx instead of workingctx https://www.mercurial-scm.org/repo/hg/rev/72fbdd373de8 changeset: 35324:72fbdd373de8 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: overlayworkingctx: add _auditconflicts to write() https://www.mercurial-scm.org/repo/hg/rev/71edd38c4bb4 changeset: 35325:71edd38c4bb4 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 22:26:07 2017 -0800 summary: overlayworkingctx: add ``tomemctx()`` https://www.mercurial-scm.org/repo/hg/rev/dc9da4f4f363 changeset: 35326:dc9da4f4f363 user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: overlayworkingctx: add `_compact()` https://www.mercurial-scm.org/repo/hg/rev/777cb4497d8d changeset: 35327:777cb4497d8d user: Phil Cohen <phil...@fb.com> date: Thu Dec 07 16:07:06 2017 -0800 summary: overlayworkingctx: invalidate the manifest cache when changing parents https://www.mercurial-scm.org/repo/hg/rev/4937db58b663 changeset: 35328:4937db58b663 bookmark: @ tag: tip user: Matthieu Laneuville <matthieu.laneuvi...@octobus.net> date: Fri Dec 08 17:20:11 2017 +0900 summary: patch: move part of tabsplitter logic in _inlinediff -- Repository URL: https://www.mercurial-scm.org/repo/hg _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
