log tests/test-evolve-content-divergent-basic.t @ 5153:1797ef00d15f stable

age author description
Tue, 14 Jan 2020 20:20:13 +0700 Anton Shestakov obslog: use _successorsetverb() in regular obslog too
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
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 16:35:01 +0800 Anton Shestakov tests: add --no-all to hg evolve to reduce test changes
Tue, 23 Apr 2019 12:28:32 +0200 Pierre-Yves David test-compat: adapt test output to 4.4 mercurial-4.4
Thu, 11 Apr 2019 22:44:53 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Thu, 11 Apr 2019 22:42:13 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6 base tests/test-divergent.t@1f4c747c83dc
Wed, 10 Apr 2019 17:57:11 +0200 Pierre-Yves David test: add test for content-divergence with file removal
Wed, 10 Apr 2019 17:29:40 +0200 Pierre-Yves David test: clarify changeset concent in the first content-divergence test
Wed, 10 Apr 2019 16:59:28 +0200 Pierre-Yves David branching: merge with test consolidation
Wed, 10 Apr 2019 14:32:00 +0200 Pierre-Yves David test: consolidate the content-divergent test cases stable base tests/test-divergent.t@1f4c747c83dc