log tests/test-evolve-public-content-divergent-main.t @ 5865:d7ed88810457 stable

age author description
Fri, 22 Jan 2021 11:04:55 +0100 Pierre-Yves David branching: merge stable into default
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes stable
Tue, 24 Nov 2020 18:04:40 -0800 Martin von Zweigbergk evolve: remove spurious "working directory is now at ..." messages stable
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes
Sat, 31 Oct 2020 20:21:12 +0800 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 13 Aug 2020 18:10:51 +0530 Sushil khanchi evolve: handle preparation logic for public divergence in one block
Fri, 08 May 2020 22:50:09 +0800 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 08 May 2020 19:22:36 +0800 Anton Shestakov test-compat: back out changeset 4da1d21231ae mercurial-5.3
Fri, 08 May 2020 04:02:22 +0200 Pierre-Yves David evolve: rename `evolve_source_*` to `divergence_source_*`
Thu, 30 Apr 2020 10:05:14 -0700 Martin von Zweigbergk evolve: always create commit when resolving divergence
Thu, 09 Apr 2020 19:52:30 +0200 Joerg Sonnenberger tests: avoid non-portable sed command
Wed, 15 Apr 2020 21:52:29 +0800 Anton Shestakov tests: update output to match 1b8fd4af3318 in core
Sat, 29 Feb 2020 15:18:00 +0700 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Mon, 04 Nov 2019 01:30:50 +0530 Sushil khanchi evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Mon, 29 Jul 2019 14:43:17 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 05 Jun 2019 17:45:45 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Tue, 04 Jun 2019 11:08:44 +0200 Pierre-Yves David branching: merge with stable base tests/test-evolve-public-content-divergent.t@fa4093f7ff5c
Fri, 26 Apr 2019 01:20:08 +0530 Sushil khanchi evolve: move status msg to verbose mode in content-divergence resolution
Sat, 27 Apr 2019 22:45:16 -0400 Matt Harbison templatekw: add `instabilities` alias for `troubles`
Wed, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
Wed, 17 Apr 2019 00:20:44 +0530 Sushil khanchi tests: consolidate the public-content-divergent test cases base tests/test-evolve-public-content-divergent.t@fa4093f7ff5c