log tests/test-evolve-abort-phasediv.t @ 5996:91c3a9dd5f77 mercurial-5.7

age author description
Thu, 17 Jun 2021 11:26:49 +0300 Anton Shestakov evolve: hg commit has --message flag stable
Thu, 11 Mar 2021 14:22:45 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Thu, 11 Mar 2021 12:29:50 +0800 Anton Shestakov test-compat: merge stable into mercurial-5.6 mercurial-5.6
Thu, 15 Oct 2020 15:40:36 -0700 Martin von Zweigbergk evolve: when relocating, optionally first try to do it using in-memory merge
Sun, 31 Jan 2021 15:39:25 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Thu, 28 Jan 2021 18:48:36 +0800 Anton Shestakov tests: back out changeset b3d9e6c805d6 mercurial-5.6
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes
Sat, 31 Oct 2020 19:33:42 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Fri, 25 Sep 2020 11:06:46 -0700 Martin von Zweigbergk evolve: don't set evolved node as dirstate p2
Fri, 27 Sep 2019 13:03:12 +0200 Pierre-Yves David test-compat: merge stable into mercurial-5.0 mercurial-5.0
Thu, 11 Jul 2019 22:56:46 +0530 Taapas Agrawal abort: added support for evolve to hg abort
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Thu, 11 Apr 2019 22:44:53 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 26 Mar 2019 12:30:10 +0100 Pierre-Yves David evolve: drop the "computing new diff message" for phase-divergence
Wed, 20 Mar 2019 09:19:02 -0700 Martin von Zweigbergk evolve: clarify output when phase-divergence resolution results in no change