tests/test-evolve-orphan-merge.t
Fri, 28 Feb 2020 22:48:46 +0700 Anton Shestakov test-compat: back out changeset 2371d40f0878 mercurial-5.2
Fri, 28 Feb 2020 20:18:42 +0700 Anton Shestakov branching: merge into stable in preparation for release stable
Mon, 27 Jan 2020 14:55:35 +0700 Anton Shestakov tests: allow an empty merge commit to have tests pass without too many changes stable
Thu, 05 Dec 2019 10:04:52 -0800 Martin von Zweigbergk tests: update now that merge.graft() doesn't set two equal parents
Wed, 16 Oct 2019 11:10:04 -0700 Martin von Zweigbergk tests: simplify by pruning unwanted changesets a little earlier
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
Thu, 25 Apr 2019 15:14:21 -0700 Martin von Zweigbergk messages: standardize on "working copy is now at" including "is"
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
Tue, 22 Jan 2019 12:57:25 -0500 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 12 Oct 2018 15:20:54 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Fri, 12 Oct 2018 15:15:09 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 21 Sep 2018 15:52:53 +0530 Sushil khanchi evovle: remove redundancy in evolve output
Fri, 03 Aug 2018 00:22:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Thu, 02 Aug 2018 02:47:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 15 Jun 2018 00:16:29 +0530 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts
Tue, 12 Jun 2018 19:00:12 +0530 Pulkit Goyal evolve: improve error messages when conflicts occur
Mon, 11 Jun 2018 01:12:12 +0530 Pulkit Goyal evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
Wed, 06 Jun 2018 04:09:49 +0530 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
Mon, 23 Apr 2018 12:23:00 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 23 Apr 2018 12:11:10 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sun, 22 Apr 2018 11:40:17 +0200 Pierre-Yves David evolve: point to '--abort' in error message
Wed, 21 Mar 2018 16:18:31 +0100 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Wed, 21 Mar 2018 16:06:17 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.4 mercurial-4.4
Sun, 18 Mar 2018 17:29:32 +0530 Pulkit Goyal evolve: handle stabilization of merge changeset with both parents obsoleted
Mon, 19 Mar 2018 12:58:31 +0530 Pulkit Goyal evolve: preserve the order of merge parents in `hg evolve --continue`
Mon, 19 Mar 2018 14:03:41 +0100 Pulkit Goyal tests: add more cases about stabilization of an orphaned merge commit
Tue, 13 Mar 2018 19:06:14 +0530 Pulkit Goyal tests: add more tests related to stabilization of orphaned merge commit
Tue, 13 Mar 2018 18:17:50 +0530 Pulkit Goyal evolve: fix stabilization of orphan merge changesets in case of conflicts
Tue, 13 Mar 2018 15:29:35 +0530 Pulkit Goyal tests: add a test file of resolving orphaness of merge changesets
less more (0) tip