Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 3855: (0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip
age author description
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()
less more | rev 3855: (0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip