| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
changeset |
files
|
| Thu, 14 Jun 2018 02:58:30 +0200 |
Pierre-Yves David |
changelog: add a changelog entry about divergence resolution
|
changeset |
files
|
| 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
|