Mercurial Mercurial > pub > hg > evolve / shortlog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -3000 -1000 -300 -100 -50 -32 +32 +50 +100 +300 +1000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
 
Fri, 08 Jun 2018 18:32:48 +0530 Pulkit Goyal next-prev: add tests showing --merge not respected in some cases stable changeset | files
Thu, 07 Jun 2018 22:59:39 +0530 Pulkit Goyal evolve: store the evolvestate if relocation results in conflicts changeset | files
Thu, 07 Jun 2018 22:45:54 +0530 Pulkit Goyal tests: add more test of resolution of content-divergent changesets changeset | files
Thu, 07 Jun 2018 18:18:10 +0530 Pulkit Goyal evolvestate: store info about relocation while resolving content-divergence changeset | files
Thu, 07 Jun 2018 18:13:54 +0530 Pulkit Goyal evolve: factor out logic to merge content divergent csets in separate fn changeset | files
Thu, 07 Jun 2018 20:27:03 +0530 Pulkit Goyal evolve: commit the transaction if conflicts occur while merging content-div changeset | files
Thu, 07 Jun 2018 15:54:32 +0530 Pulkit Goyal tests: add tests for resolving content-divergence when different parents changeset | files
Fri, 01 Jun 2018 19:52:06 +0530 Pulkit Goyal evolve: implement resolution of content-divergence when on differet parents changeset | files
Fri, 01 Jun 2018 19:57:19 +0530 Pulkit Goyal tests: add tests for resolving content-divergence with parent change changeset | files
Wed, 06 Jun 2018 03:49:17 +0530 Pulkit Goyal CHANGELOG: add an entry about fixing issue5877 changeset | files
Wed, 06 Jun 2018 03:26:47 +0530 Pulkit Goyal evolve: pop up editor if conflicts occur while merging commit messages changeset | files
Mon, 04 Jun 2018 01:28:02 +0530 Pulkit Goyal evolve: merge commit messages while resolving content-divergence (issue5877) changeset | files
Wed, 06 Jun 2018 01:19:36 +0530 Pulkit Goyal evolve: move if-else block under the right block changeset | files
Tue, 05 Jun 2018 22:02:24 +0530 Pulkit Goyal tests: make sure we don't result in commit messages conflict changeset | files
Tue, 05 Jun 2018 21:02:09 +0530 Pulkit Goyal tests: don't use mkcommit shell function in test-divergent.t changeset | files
Wed, 06 Jun 2018 14:35:36 +0200 Pierre-Yves David evolve: remove duplicated documentation changeset | files
Wed, 06 Jun 2018 04:09:49 +0530 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts changeset | files
Wed, 23 May 2018 01:11:59 +0530 Pulkit Goyal evolve: add a help topic `Interrupted-Evolve` changeset | files
Tue, 05 Jun 2018 03:37:15 +0200 Pierre-Yves David branching: merge with stable changeset | files
Tue, 05 Jun 2018 03:36:40 +0200 Pierre-Yves David changelog: fix version number error stable changeset | files
Thu, 24 May 2018 02:12:14 +0530 Pulkit Goyal evolve: return the new node formed only as the replacement changeset | files
Thu, 24 May 2018 17:04:20 +0530 Pulkit Goyal tests: add more test of --abort flag for content-divergence resolution changeset | files
Mon, 04 Jun 2018 04:03:02 +0530 Pulkit Goyal evolve: prompt user for branch selection while resolving content-divergence changeset | files
Tue, 05 Jun 2018 03:51:01 +0530 Pulkit Goyal evolve: pass the base revision in _completecontentdivergent() changeset | files
Tue, 05 Jun 2018 03:49:49 +0530 Pulkit Goyal evolve: store the base of content-divergents in evolvestate changeset | files
Tue, 05 Jun 2018 00:53:21 +0530 Pulkit Goyal evolve: use cmdrewrite.amend() instead of creating a new commit changeset | files
Sun, 03 Jun 2018 01:59:41 +0530 Pulkit Goyal corecompat: update the tests output to show phase update summary changeset | files
Sun, 03 Jun 2018 03:24:43 +0530 Pulkit Goyal CHANGELOG: add an entry about issue 5808 being fixed stable changeset | files
Sun, 03 Jun 2018 03:21:25 +0530 Pulkit Goyal next-prev: replace the error hint to mention about `--merge` flag stable changeset | files
Sun, 03 Jun 2018 03:13:47 +0530 Pulkit Goyal tests: add tests for conflicts while respecting commands.update.check stable changeset | files
Sun, 03 Jun 2018 02:37:13 +0530 Pulkit Goyal next: respect `commands.update.check` config option in `hg next` (issue5808) stable changeset | files
Sun, 03 Jun 2018 02:36:24 +0530 Pulkit Goyal prev: respect `commands.update.check` config option in `hg prev` (issue5808) stable changeset | files
(0) -3000 -1000 -300 -100 -50 -32 +32 +50 +100 +300 +1000 tip
evolve