Sun, 17 Jun 2018 03:07:53 +0200 |
Pierre-Yves David |
rewind: move revision selection into its own function
|
Sun, 17 Jun 2018 02:32:29 +0200 |
Pierre-Yves David |
rewind: automatically rewind entire stack
|
Sun, 17 Jun 2018 02:22:28 +0200 |
Pierre-Yves David |
rewind: add a test about rewinding top of stack
|
Sun, 17 Jun 2018 02:03:03 +0200 |
Pierre-Yves David |
rewind: use rewinded parent when creating multiple changesets
|
Sun, 17 Jun 2018 00:22:31 +0200 |
Pierre-Yves David |
rewind: add a test for rewinding a fold
|
Sun, 17 Jun 2018 01:36:30 +0200 |
Pierre-Yves David |
rewind: add a test for rewinding a split
|
Sun, 17 Jun 2018 00:33:43 +0200 |
Pierre-Yves David |
rewind: update the working copy if it gets obsoleted
|
Sun, 17 Jun 2018 01:04:20 +0200 |
Pierre-Yves David |
rewind: add a message about obsolete changeset
|
Sun, 17 Jun 2018 00:15:18 +0200 |
Pierre-Yves David |
rewind: obsolete latest successors unless instructed otherwise
|
Sat, 16 Jun 2018 23:32:22 +0200 |
Pierre-Yves David |
rewind: test rewinding an amended changesets
|
Sun, 17 Jun 2018 00:57:09 +0200 |
Pierre-Yves David |
rewind: add a message about the rewinded changesets
|
Sat, 16 Jun 2018 23:11:52 +0200 |
Pierre-Yves David |
rewind: add a proto version of the command
|
Fri, 29 Jun 2018 16:51:56 +0200 |
Pierre-Yves David |
stablesort: make sure heads are processed in sorted order
|
Tue, 19 Jun 2018 23:21:54 +0530 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
Tue, 19 Jun 2018 23:21:44 +0530 |
Pulkit Goyal |
tests: add test to demonstrate issue5923
|
Thu, 28 Jun 2018 17:26:16 +0200 |
Pierre-Yves David |
changelog: add an entry about the new `evolve.interrupted` section
|
Fri, 15 Jun 2018 00:50:17 +0530 |
Pulkit Goyal |
evolve: make one missed error to align other error messages
|
Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
Thu, 14 Jun 2018 02:58:30 +0200 |
Pierre-Yves David |
changelog: add a changelog entry about divergence resolution
|
Thu, 14 Jun 2018 01:39:33 +0530 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
Thu, 14 Jun 2018 01:39:11 +0530 |
Pulkit Goyal |
tests: fix a test case to not create conflicts
|
Thu, 14 Jun 2018 01:06:12 +0530 |
Pulkit Goyal |
evolve: introduce a resolutionparent variable and store it in evolvestate
|
Wed, 13 Jun 2018 18:08:57 +0530 |
Pulkit Goyal |
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
|
Wed, 13 Jun 2018 17:15:10 +0530 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
Tue, 12 Jun 2018 23:20:54 +0530 |
Pulkit Goyal |
evolve: always order the revs to be evolved
|
Tue, 12 Jun 2018 21:13:02 +0530 |
Pulkit Goyal |
tests: add test of resolution of content-divergent stacks
|
Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
Tue, 12 Jun 2018 04:01:19 +0530 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
Tue, 12 Jun 2018 03:29:13 +0530 |
Pulkit Goyal |
tests: add test about aborting content-divergence when multiple parents
|
Wed, 13 Jun 2018 15:47:19 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about the --update flag
|
Wed, 06 Jun 2018 04:29:05 +0530 |
Pulkit Goyal |
evolve: show unfinished information in `hg status -v` (issue5886)
|
Tue, 12 Jun 2018 13:58:14 +0200 |
Denis Laxalde |
style: drop a (commented) debug print
|
Sun, 10 Jun 2018 20:58:55 +0530 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
Tue, 12 Jun 2018 10:40:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
Mon, 11 Jun 2018 23:31:44 +0530 |
Pulkit Goyal |
Added tag 8.0.1 for changeset 0887c30255a1
stable
|
Mon, 11 Jun 2018 23:30:24 +0530 |
Pulkit Goyal |
packaging: prepare for 8.0.1 release
stable 8.0.1
|
Mon, 11 Jun 2018 20:24:45 +0200 |
Pierre-Yves David |
changelog: add a couple of missing entry
stable
|
Mon, 11 Jun 2018 20:17:56 +0530 |
Pulkit Goyal |
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
|
Mon, 11 Jun 2018 20:13:36 +0530 |
Pulkit Goyal |
evolve: store the obsmarkers to be deleted in evolvestate
|
Mon, 11 Jun 2018 15:52:11 +0530 |
Pulkit Goyal |
evolve: store obsmarkers to be deleted in evolvestate
|
Mon, 11 Jun 2018 15:38:43 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge branches in separate function
|
Mon, 11 Jun 2018 01:00:57 +0530 |
Pulkit Goyal |
tests: add more test of --stop while resolving content-divergence
|
Mon, 11 Jun 2018 00:47:28 +0530 |
Pulkit Goyal |
evolve: strip the relocation commit on `hg evolve --stop`
|
Mon, 11 Jun 2018 00:43:39 +0530 |
Pulkit Goyal |
evolve: declare updated and pctx variables in stopevolve()
|
Sun, 10 Jun 2018 22:52:11 +0530 |
Pulkit Goyal |
evolve: store the old other divergent node after relocation in evolvestate
|
Sun, 10 Jun 2018 22:42:57 +0530 |
Pulkit Goyal |
evolve: factor out logic for --stop flag in separate function
|
Sun, 10 Jun 2018 22:38:08 +0530 |
Pulkit Goyal |
tests: add test for --stop flag when resolving multiparents content-div
|
Sun, 10 Jun 2018 20:35:48 +0530 |
Pulkit Goyal |
evolve: move logic to continue interrupted content-div resolution to new fn
|
Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
Sat, 09 Jun 2018 00:15:27 +0530 |
Pulkit Goyal |
packaging: update tested-with statements in evolve and topic
stable
|
Sat, 09 Jun 2018 00:12:08 +0530 |
Pulkit Goyal |
CHANGELOG: mention about 4.6.1 compatibility
stable
|
Fri, 08 Jun 2018 22:52:53 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
Fri, 08 Jun 2018 22:52:52 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
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
|