Mercurial Mercurial > pub > hg > evolve / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) -15 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-conflict.t
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them file | diff | annotate
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4 file | diff | annotate
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch file | diff | annotate
Tue, 22 Jan 2019 12:57:25 -0500 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4 file | diff | annotate
Tue, 21 Aug 2018 14:09:33 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3 file | diff | annotate
Tue, 21 Aug 2018 13:26:35 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4 file | diff | annotate
Sat, 18 Aug 2018 21:03:45 +0530 Pulkit Goyal evolve: set the second parent if we get conflicts while evolving stable file | diff | annotate
Fri, 03 Aug 2018 00:22:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3 file | diff | annotate
Thu, 02 Aug 2018 02:47:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4 file | diff | annotate
Fri, 15 Jun 2018 00:16:29 +0530 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts file | diff | annotate
Tue, 12 Jun 2018 19:00:12 +0530 Pulkit Goyal evolve: improve error messages when conflicts occur file | diff | annotate
Mon, 11 Jun 2018 01:12:12 +0530 Pulkit Goyal evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted file | diff | annotate
Wed, 06 Jun 2018 04:09:49 +0530 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts file | diff | annotate
Mon, 23 Apr 2018 12:23:00 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3 file | diff | annotate
Mon, 23 Apr 2018 12:11:10 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4 file | diff | annotate
less more (0) -15 tip
evolve