19 new changesets (1 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/28f0092ec89f changeset: 48549:28f0092ec89f user: Joerg Sonnenberger <jo...@bec.de> date: Mon Jan 03 01:09:56 2022 +0100 summary: exchange: add fast path for subrepo check on push
https://www.mercurial-scm.org/repo/hg/rev/21c0ae0693bc changeset: 48550:21c0ae0693bc user: Cédric Krier <c...@b2ck.com> date: Sun Jan 09 13:35:30 2022 +0100 summary: tests: support pygments 2.11 (issue6628) https://www.mercurial-scm.org/repo/hg/rev/f98d4d0a299a changeset: 48551:f98d4d0a299a branch: stable parent: 48537:ca0c6d8c456b user: Matt Harbison <matt_harbi...@yahoo.com> date: Mon Jan 10 18:04:41 2022 -0500 summary: subrepo: make -S work again on Windows for incoming/outgoing to remote repos https://www.mercurial-scm.org/repo/hg/rev/91017508a785 changeset: 48552:91017508a785 parent: 48550:21c0ae0693bc user: Martin von Zweigbergk <martinv...@google.com> date: Thu Jan 06 22:03:21 2022 -0800 summary: logcmdutil: raise `InputError` on bad CLI arguments https://www.mercurial-scm.org/repo/hg/rev/3b6b43a7ace4 changeset: 48553:3b6b43a7ace4 user: Martin von Zweigbergk <martinv...@google.com> date: Thu Jan 06 22:09:40 2022 -0800 summary: logcmdutil: raise `StateError` when file to follow doesn't exist https://www.mercurial-scm.org/repo/hg/rev/0dc698c91ca0 changeset: 48554:0dc698c91ca0 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 14 10:25:45 2022 -0800 summary: rust: upgrade `rand*` crates https://www.mercurial-scm.org/repo/hg/rev/c91418480cb0 changeset: 48555:c91418480cb0 user: Martin von Zweigbergk <martinv...@google.com> date: Tue Dec 14 13:12:56 2021 -0800 summary: simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels https://www.mercurial-scm.org/repo/hg/rev/ce8c82a5cd65 changeset: 48556:ce8c82a5cd65 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 07 18:42:31 2022 -0800 summary: simplemerge: convert `merge_lines()` away from generator https://www.mercurial-scm.org/repo/hg/rev/c6649c53073f changeset: 48557:c6649c53073f user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 07 22:16:22 2022 -0800 summary: simplemerge: make merge_lines() a free function https://www.mercurial-scm.org/repo/hg/rev/2dbee604a4f0 changeset: 48558:2dbee604a4f0 user: Martin von Zweigbergk <martinv...@google.com> date: Tue Jan 11 16:54:42 2022 -0800 summary: simplemerge: clarify names of functions that render conflict markers https://www.mercurial-scm.org/repo/hg/rev/b5e1283c0475 changeset: 48559:b5e1283c0475 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 07 22:23:44 2022 -0800 summary: simplemerge: use same newline detection for :mergediff as for :merge[3] https://www.mercurial-scm.org/repo/hg/rev/6ad70879d2bd changeset: 48560:6ad70879d2bd user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 07 23:29:19 2022 -0800 summary: simplemerge: move default labels to simplemerge extension https://www.mercurial-scm.org/repo/hg/rev/69e76b2aad3d changeset: 48561:69e76b2aad3d user: Martin von Zweigbergk <martinv...@google.com> date: Tue Jan 11 16:23:10 2022 -0800 summary: simplemerge: split out function for rendering :merge3 conflict markers https://www.mercurial-scm.org/repo/hg/rev/12ac4401ff7d changeset: 48562:12ac4401ff7d user: Martin von Zweigbergk <martinv...@google.com> date: Tue Jan 11 21:56:27 2022 -0800 summary: simplemerge: simplify and rename `render_markers()` https://www.mercurial-scm.org/repo/hg/rev/ad0c6bf6f02e changeset: 48563:ad0c6bf6f02e user: Martin von Zweigbergk <martinv...@google.com> date: Tue Jan 11 22:03:55 2022 -0800 summary: simplemerge: make minimize() a free function https://www.mercurial-scm.org/repo/hg/rev/c2537aec3bb6 changeset: 48564:c2537aec3bb6 user: Martin von Zweigbergk <martinv...@google.com> date: Tue Jan 11 22:13:56 2022 -0800 summary: simplemerge: change _minimize() to minimize a single conflict https://www.mercurial-scm.org/repo/hg/rev/7ed4c4753891 changeset: 48565:7ed4c4753891 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 14 08:44:36 2022 -0800 summary: simplemerge: delete unused exception class `CantReprocessAndShowBase` https://www.mercurial-scm.org/repo/hg/rev/50de08904c63 changeset: 48566:50de08904c63 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Jan 14 09:28:44 2022 -0800 summary: merge: consider the file merged when using :merge-{local,other} https://www.mercurial-scm.org/repo/hg/rev/d1210d56008b changeset: 48567:d1210d56008b bookmark: @ tag: tip user: Simon Sapin <simon.sa...@octobus.net> date: Mon Jan 17 12:50:13 2022 +0100 summary: rust: Fix outdated comments in OwningDirstateMap -- 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
