| Thu, 14 Jun 2018 01:39:33 +0530 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
changeset |
files
|
| Thu, 14 Jun 2018 01:39:11 +0530 |
Pulkit Goyal |
tests: fix a test case to not create conflicts
|
changeset |
files
|
| Thu, 14 Jun 2018 01:06:12 +0530 |
Pulkit Goyal |
evolve: introduce a resolutionparent variable and store it in evolvestate
|
changeset |
files
|
| Wed, 13 Jun 2018 18:08:57 +0530 |
Pulkit Goyal |
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
|
changeset |
files
|
| Wed, 13 Jun 2018 17:15:10 +0530 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
changeset |
files
|
| Tue, 12 Jun 2018 23:20:54 +0530 |
Pulkit Goyal |
evolve: always order the revs to be evolved
|
changeset |
files
|
| Tue, 12 Jun 2018 21:13:02 +0530 |
Pulkit Goyal |
tests: add test of resolution of content-divergent stacks
|
changeset |
files
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
changeset |
files
|
| Tue, 12 Jun 2018 04:01:19 +0530 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
changeset |
files
|
| Tue, 12 Jun 2018 03:29:13 +0530 |
Pulkit Goyal |
tests: add test about aborting content-divergence when multiple parents
|
changeset |
files
|
| Wed, 13 Jun 2018 15:47:19 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about the --update flag
|
changeset |
files
|
| Wed, 06 Jun 2018 04:29:05 +0530 |
Pulkit Goyal |
evolve: show unfinished information in `hg status -v` (issue5886)
|
changeset |
files
|
| Tue, 12 Jun 2018 13:58:14 +0200 |
Denis Laxalde |
style: drop a (commented) debug print
|
changeset |
files
|
| Sun, 10 Jun 2018 20:58:55 +0530 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
changeset |
files
|
| Tue, 12 Jun 2018 10:40:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 11 Jun 2018 23:31:44 +0530 |
Pulkit Goyal |
Added tag 8.0.1 for changeset 0887c30255a1
stable
|
changeset |
files
|
| Mon, 11 Jun 2018 23:30:24 +0530 |
Pulkit Goyal |
packaging: prepare for 8.0.1 release
stable 8.0.1
|
changeset |
files
|
| Mon, 11 Jun 2018 20:24:45 +0200 |
Pierre-Yves David |
changelog: add a couple of missing entry
stable
|
changeset |
files
|
| Mon, 11 Jun 2018 20:17:56 +0530 |
Pulkit Goyal |
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
|
changeset |
files
|
| Mon, 11 Jun 2018 20:13:36 +0530 |
Pulkit Goyal |
evolve: store the obsmarkers to be deleted in evolvestate
|
changeset |
files
|
| Mon, 11 Jun 2018 15:52:11 +0530 |
Pulkit Goyal |
evolve: store obsmarkers to be deleted in evolvestate
|
changeset |
files
|
| Mon, 11 Jun 2018 15:38:43 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge branches in separate function
|
changeset |
files
|
| Mon, 11 Jun 2018 01:00:57 +0530 |
Pulkit Goyal |
tests: add more test of --stop while resolving content-divergence
|
changeset |
files
|
| Mon, 11 Jun 2018 00:47:28 +0530 |
Pulkit Goyal |
evolve: strip the relocation commit on `hg evolve --stop`
|
changeset |
files
|
| Mon, 11 Jun 2018 00:43:39 +0530 |
Pulkit Goyal |
evolve: declare updated and pctx variables in stopevolve()
|
changeset |
files
|
| Sun, 10 Jun 2018 22:52:11 +0530 |
Pulkit Goyal |
evolve: store the old other divergent node after relocation in evolvestate
|
changeset |
files
|
| Sun, 10 Jun 2018 22:42:57 +0530 |
Pulkit Goyal |
evolve: factor out logic for --stop flag in separate function
|
changeset |
files
|
| Sun, 10 Jun 2018 22:38:08 +0530 |
Pulkit Goyal |
tests: add test for --stop flag when resolving multiparents content-div
|
changeset |
files
|
| Sun, 10 Jun 2018 20:35:48 +0530 |
Pulkit Goyal |
evolve: move logic to continue interrupted content-div resolution to new fn
|
changeset |
files
|
| Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
changeset |
files
|
| Sat, 09 Jun 2018 00:15:27 +0530 |
Pulkit Goyal |
packaging: update tested-with statements in evolve and topic
stable
|
changeset |
files
|
| Sat, 09 Jun 2018 00:12:08 +0530 |
Pulkit Goyal |
CHANGELOG: mention about 4.6.1 compatibility
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 22:52:53 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Fri, 08 Jun 2018 22:52:52 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 08 Jun 2018 22:52:51 +0530 |
Pulkit Goyal |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 22 May 2018 23:51:57 +0530 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 19:48:53 +0530 |
Pulkit Goyal |
CHANGELOG: add couple of entries about things fixed
stable
|
changeset |
files
|
| Fri, 08 Jun 2018 17:36:28 +0530 |
Pulkit Goyal |
next-prev: always respect the --merge flag
stable
|
changeset |
files
|
| 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
|
| Sun, 03 Jun 2018 02:50:55 +0530 |
Pulkit Goyal |
tests: add test demonstrating issue5808
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:26:19 +0530 |
Pulkit Goyal |
next: bail out early in `hg next --evolve` if dirty wdir
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 02:24:28 +0530 |
Pulkit Goyal |
tests: add test of `hg next --evolve` with dirty working directory
stable
|
changeset |
files
|
| Sun, 03 Jun 2018 03:35:22 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5897
stable
|
changeset |
files
|
| Sun, 27 May 2018 02:32:58 +0530 |
Pulkit Goyal |
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
stable
|
changeset |
files
|
| Wed, 30 May 2018 00:34:35 +0530 |
Pulkit Goyal |
tests: add a test demonstrating issue5897
stable
|
changeset |
files
|
| Thu, 24 May 2018 17:50:02 +0530 |
Pulkit Goyal |
evolve: add an `--update` flag to `hg evolve` command
|
changeset |
files
|
| Thu, 24 May 2018 02:02:11 +0530 |
Pulkit Goyal |
tests: add tests for testing --abort while content-divergence resolution
|
changeset |
files
|
| Thu, 24 May 2018 00:58:50 +0530 |
Pulkit Goyal |
evolve: fix storage of replacements and temprevs node in evolvestate
|
changeset |
files
|
| Thu, 24 May 2018 00:58:35 +0530 |
Pulkit Goyal |
tests: add more tests related to aborting while resolving phase-divergence
|
changeset |
files
|
| Wed, 23 May 2018 12:16:24 +0200 |
Denis Laxalde |
topic: suggest to clear a topic that becomes empty
|
changeset |
files
|
| Wed, 23 May 2018 11:37:37 +0200 |
Denis Laxalde |
topic: display a hint pointing at help when a topic becomes non-empty
|
changeset |
files
|
| Thu, 24 May 2018 18:57:46 +0200 |
Pierre-Yves David |
branching: merge with compat fix on default
|
changeset |
files
|
| Thu, 24 May 2018 01:50:26 +0530 |
Pulkit Goyal |
evolve: add compat for repair.stripbmrevset which is moved to scmutil
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:18:14 +0200 |
Pierre-Yves David |
evolve: update the readme with more information about contribution
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:03:31 +0200 |
Denis Laxalde |
topic: dedent items about publishing behavior in docstring
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:00:11 +0200 |
Denis Laxalde |
topic: use preformatted block for config snippets documentation
stable
|
changeset |
files
|
| Wed, 23 May 2018 11:09:37 +0200 |
Denis Laxalde |
tests: add a test for "hg help -e topic"
stable
|
changeset |
files
|
| Wed, 23 May 2018 01:24:02 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 22 May 2018 21:33:50 +0530 |
Pulkit Goyal |
content-div: add test showing `--stop` works during interrupted resolution
|
changeset |
files
|
| Mon, 23 Apr 2018 14:48:53 +0530 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
changeset |
files
|
| Tue, 22 May 2018 20:33:42 +0530 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
changeset |
files
|
| Tue, 22 May 2018 23:51:57 +0530 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
|
changeset |
files
|
| Wed, 23 May 2018 02:46:20 +0530 |
Pulkit Goyal |
evolve: make `--abort` strip the temporary revs created during resolution
|
changeset |
files
|
| Wed, 23 May 2018 02:43:23 +0530 |
Pulkit Goyal |
evolve: store a list of temprevs in evolvestate
|
changeset |
files
|
| Wed, 23 May 2018 02:36:14 +0530 |
Pulkit Goyal |
evolve: check for None before adding in set of revisions to strip
|
changeset |
files
|