16 new changesets (5 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/897aa0c4da4a changeset: 48424:897aa0c4da4a branch: stable parent: 48412:602120a96072 user: Raphaël Gomès <rgo...@octobus.net> date: Thu Nov 25 18:26:50 2021 +0100 summary: downgrade: don't assume existence of nodemap files when downgrading
https://www.mercurial-scm.org/repo/hg/rev/9e1f174d305b changeset: 48425:9e1f174d305b parent: 48423:fff5942d445f user: Martin von Zweigbergk <martinv...@google.com> date: Mon Nov 29 23:00:29 2021 -0800 summary: simplemerge: set `conflicts` earlier for :union tool https://www.mercurial-scm.org/repo/hg/rev/de8181c5414d changeset: 48426:de8181c5414d user: Martin von Zweigbergk <martinv...@google.com> date: Fri Dec 03 21:50:25 2021 -0800 summary: tests: remove unnecessary explicit args from `failfilemerge.py` https://www.mercurial-scm.org/repo/hg/rev/38941a28406a changeset: 48427:38941a28406a user: Martin von Zweigbergk <martinv...@google.com> date: Thu Dec 02 22:59:36 2021 -0800 summary: mergestate: merge `preresolve()` into `resolve()` https://www.mercurial-scm.org/repo/hg/rev/c25a67cfc291 changeset: 48428:c25a67cfc291 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Dec 03 13:53:02 2021 -0800 summary: mergestate: make `_resolve()` do both preresolve and resolve https://www.mercurial-scm.org/repo/hg/rev/f9bc36863923 changeset: 48429:f9bc36863923 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Dec 03 15:43:54 2021 -0800 summary: mergestate: inline `_resolve()` into `resolve()` https://www.mercurial-scm.org/repo/hg/rev/921853391276 changeset: 48430:921853391276 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Dec 03 16:21:46 2021 -0800 summary: filemerge: merge `premerge()` into `filemerge()` https://www.mercurial-scm.org/repo/hg/rev/6b1049d71c3e changeset: 48431:6b1049d71c3e user: Martin von Zweigbergk <martinv...@google.com> date: Fri Dec 03 21:41:43 2021 -0800 summary: filemerge: make `_filemerge()` do both premerge and merge https://www.mercurial-scm.org/repo/hg/rev/f45a4a47f6a8 changeset: 48432:f45a4a47f6a8 user: Martin von Zweigbergk <martinv...@google.com> date: Fri Dec 03 22:45:35 2021 -0800 summary: filemerge: inline `_filemerge()` into `filemerge()` https://www.mercurial-scm.org/repo/hg/rev/0994125a31e5 changeset: 48433:0994125a31e5 user: Martin von Zweigbergk <martinv...@google.com> date: Mon Dec 06 12:30:54 2021 -0800 summary: filemerge: remove `premerge` argument from `_makebackup()` https://www.mercurial-scm.org/repo/hg/rev/d4c084160434 changeset: 48434:d4c084160434 branch: stable parent: 48424:897aa0c4da4a user: Pierre-Yves David <pierre-yves.da...@octobus.net> date: Mon Dec 06 10:23:51 2021 +0100 summary: test-upgrade: narrow the `debugformat` call when upgrading to dirstate-v2 https://www.mercurial-scm.org/repo/hg/rev/18032c282a7e changeset: 48435:18032c282a7e branch: stable user: Pierre-Yves David <pierre-yves.da...@octobus.net> date: Tue Dec 07 10:03:00 2021 +0100 summary: upgrade: don't use `dd status=none` in the test https://www.mercurial-scm.org/repo/hg/rev/25c352b58b4e changeset: 48436:25c352b58b4e branch: stable user: Pierre-Yves David <pierre-yves.da...@octobus.net> date: Mon Dec 06 10:52:40 2021 +0100 summary: dirstate-v2: test upgrade without rust too https://www.mercurial-scm.org/repo/hg/rev/6e4999cb085e changeset: 48437:6e4999cb085e branch: stable user: Pierre-Yves David <pierre-yves.da...@octobus.net> date: Mon Dec 06 10:08:04 2021 +0100 summary: dirstate-v2: fix upgrade on an empty repository https://www.mercurial-scm.org/repo/hg/rev/715e4e81e39a changeset: 48438:715e4e81e39a parent: 48433:0994125a31e5 parent: 48437:6e4999cb085e user: Raphaël Gomès <rgo...@octobus.net> date: Wed Dec 08 10:14:37 2021 +0100 summary: branching: merge stable into default https://www.mercurial-scm.org/repo/hg/rev/9cf5ac8c7109 changeset: 48439:9cf5ac8c7109 bookmark: @ tag: tip user: Raphaël Gomès <rgo...@octobus.net> date: Tue Dec 07 12:34:58 2021 +0100 summary: rhg: support the new extension suboptions syntax -- 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
