log

age author description
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
Sun, 03 Jun 2018 01:59:41 +0530 Pulkit Goyal corecompat: update the tests output to show phase update summary
Sun, 03 Jun 2018 03:24:43 +0530 Pulkit Goyal CHANGELOG: add an entry about issue 5808 being fixed stable
Sun, 03 Jun 2018 03:21:25 +0530 Pulkit Goyal next-prev: replace the error hint to mention about `--merge` flag stable
Sun, 03 Jun 2018 03:13:47 +0530 Pulkit Goyal tests: add tests for conflicts while respecting commands.update.check stable
Sun, 03 Jun 2018 02:37:13 +0530 Pulkit Goyal next: respect `commands.update.check` config option in `hg next` (issue5808) stable
Sun, 03 Jun 2018 02:36:24 +0530 Pulkit Goyal prev: respect `commands.update.check` config option in `hg prev` (issue5808) stable
Sun, 03 Jun 2018 02:50:55 +0530 Pulkit Goyal tests: add test demonstrating issue5808 stable
Sun, 03 Jun 2018 02:26:19 +0530 Pulkit Goyal next: bail out early in `hg next --evolve` if dirty wdir stable
Sun, 03 Jun 2018 02:24:28 +0530 Pulkit Goyal tests: add test of `hg next --evolve` with dirty working directory stable
Sun, 03 Jun 2018 03:35:22 +0530 Pulkit Goyal CHANGELOG: add an entry about fixing issue5897 stable
Sun, 27 May 2018 02:32:58 +0530 Pulkit Goyal evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) stable
Wed, 30 May 2018 00:34:35 +0530 Pulkit Goyal tests: add a test demonstrating issue5897 stable
Thu, 24 May 2018 17:50:02 +0530 Pulkit Goyal evolve: add an `--update` flag to `hg evolve` command
Thu, 24 May 2018 02:02:11 +0530 Pulkit Goyal tests: add tests for testing --abort while content-divergence resolution