Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 3816: (0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip
age author description
Fri, 08 Jun 2018 22:52:51 +0530 Pulkit Goyal test-compat: merge stable into mercurial-4.5 mercurial-4.5
Tue, 22 May 2018 23:51:57 +0530 Pulkit Goyal utility: use ui.interactive() instead of checking config value stable
Fri, 08 Jun 2018 19:48:53 +0530 Pulkit Goyal CHANGELOG: add couple of entries about things fixed stable
Fri, 08 Jun 2018 17:36:28 +0530 Pulkit Goyal next-prev: always respect the --merge flag stable
Fri, 08 Jun 2018 18:32:48 +0530 Pulkit Goyal next-prev: add tests showing --merge not respected in some cases stable
Thu, 07 Jun 2018 22:59:39 +0530 Pulkit Goyal evolve: store the evolvestate if relocation results in conflicts
Thu, 07 Jun 2018 22:45:54 +0530 Pulkit Goyal tests: add more test of resolution of content-divergent changesets
Thu, 07 Jun 2018 18:18:10 +0530 Pulkit Goyal evolvestate: store info about relocation while resolving content-divergence
Thu, 07 Jun 2018 18:13:54 +0530 Pulkit Goyal evolve: factor out logic to merge content divergent csets in separate fn
Thu, 07 Jun 2018 20:27:03 +0530 Pulkit Goyal evolve: commit the transaction if conflicts occur while merging content-div
Thu, 07 Jun 2018 15:54:32 +0530 Pulkit Goyal tests: add tests for resolving content-divergence when different parents
Fri, 01 Jun 2018 19:52:06 +0530 Pulkit Goyal evolve: implement resolution of content-divergence when on differet parents
Fri, 01 Jun 2018 19:57:19 +0530 Pulkit Goyal tests: add tests for resolving content-divergence with parent change
Wed, 06 Jun 2018 03:49:17 +0530 Pulkit Goyal CHANGELOG: add an entry about fixing issue5877
Wed, 06 Jun 2018 03:26:47 +0530 Pulkit Goyal evolve: pop up editor if conflicts occur while merging commit messages
Mon, 04 Jun 2018 01:28:02 +0530 Pulkit Goyal evolve: merge commit messages while resolving content-divergence (issue5877)
Wed, 06 Jun 2018 01:19:36 +0530 Pulkit Goyal evolve: move if-else block under the right block
Tue, 05 Jun 2018 22:02:24 +0530 Pulkit Goyal tests: make sure we don't result in commit messages conflict
Tue, 05 Jun 2018 21:02:09 +0530 Pulkit Goyal tests: don't use mkcommit shell function in test-divergent.t
Wed, 06 Jun 2018 14:35:36 +0200 Pierre-Yves David evolve: remove duplicated documentation
Wed, 06 Jun 2018 04:09:49 +0530 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
Wed, 23 May 2018 01:11:59 +0530 Pulkit Goyal evolve: add a help topic `Interrupted-Evolve`
Tue, 05 Jun 2018 03:37:15 +0200 Pierre-Yves David branching: merge with stable
Tue, 05 Jun 2018 03:36:40 +0200 Pierre-Yves David changelog: fix version number error stable
Thu, 24 May 2018 02:12:14 +0530 Pulkit Goyal evolve: return the new node formed only as the replacement
Thu, 24 May 2018 17:04:20 +0530 Pulkit Goyal tests: add more test of --abort flag for content-divergence resolution
Mon, 04 Jun 2018 04:03:02 +0530 Pulkit Goyal evolve: prompt user for branch selection while resolving content-divergence
Tue, 05 Jun 2018 03:51:01 +0530 Pulkit Goyal evolve: pass the base revision in _completecontentdivergent()
Tue, 05 Jun 2018 03:49:49 +0530 Pulkit Goyal evolve: store the base of content-divergents in evolvestate
Tue, 05 Jun 2018 00:53:21 +0530 Pulkit Goyal evolve: use cmdrewrite.amend() instead of creating a new commit
less more | rev 3816: (0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip