evolve: revision graph

graph

less more | rev 3940: (0) -3000 -1000 -120 +120 +1000 tip

packaging: mark version as development version stable
Mon, 13 Aug 2018 12:55:10 +0200, by Pierre-Yves David
Added tag 8.1.0 for changeset 2c5d79c6459c stable
Fri, 03 Aug 2018 05:43:54 +0200, by Pierre-Yves David
packaging: prepare version stable 8.1.0
Fri, 03 Aug 2018 05:41:08 +0200, by Pierre-Yves David
branching: merge stable into default
Fri, 03 Aug 2018 01:16:51 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Fri, 03 Aug 2018 00:22:50 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 03 Aug 2018 00:19:47 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Fri, 03 Aug 2018 00:19:46 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
Fri, 03 Aug 2018 00:19:45 +0200, by Pierre-Yves David
compat: fix obslog compatiblity with 4.3 stable
Fri, 03 Aug 2018 00:52:10 +0200, by Boris Feld
compat: add a fixed version of mergecopies for hg<=4.3 stable
Thu, 02 Aug 2018 16:54:40 +0300, by Pulkit Goyal
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Thu, 02 Aug 2018 02:47:44 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Thu, 02 Aug 2018 02:42:15 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
Thu, 02 Aug 2018 02:42:14 +0200, by Pierre-Yves David
compat: make compatible call to ui.edit for hg <= 4.3 stable
Thu, 02 Aug 2018 04:11:54 +0200, by Pierre-Yves David
compat: ignore extra status feature for hg <= 4.3 stable
Thu, 02 Aug 2018 03:08:52 +0200, by Pierre-Yves David
format: fix indentation level stable
Thu, 02 Aug 2018 02:41:33 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Thu, 02 Aug 2018 01:58:44 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
Thu, 02 Aug 2018 01:57:13 +0200, by Pierre-Yves David
compat: disable empty topic warning on `hg phases` for hg <=4.5 stable
Thu, 02 Aug 2018 02:15:48 +0200, by Pierre-Yves David
compat: restore compatibility with Mercurial <= 4.5 stable
Thu, 02 Aug 2018 01:31:02 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
Thu, 02 Aug 2018 01:53:01 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.6 mercurial-4.6
Tue, 31 Jul 2018 12:54:46 +0200, by Pierre-Yves David
branching: merge stable back into default
Wed, 01 Aug 2018 23:52:10 +0200, by Pierre-Yves David
compat: improve detection of Mercurial 4.6 stable
Tue, 31 Jul 2018 07:38:37 -0500, by Andrew Fischer
cleanup: use NotImplementedError instead of NotImplemented stable
Tue, 31 Jul 2018 13:06:20 +0200, by Pierre-Yves David
CHANGELOG: add some entries and remove duplicated entries stable
Tue, 24 Jul 2018 00:52:14 +0530, by Pulkit Goyal
branching: merge default into stable stable
Tue, 31 Jul 2018 12:52:06 +0200, by Pierre-Yves David
branching: merge with the other head mercurial-4.6
Tue, 31 Jul 2018 12:07:39 +0200, by Pierre-Yves David
test-compat: backed out changeset 8fe8152ff071 mercurial-4.6
Tue, 31 Jul 2018 11:48:15 +0200, by Pierre-Yves David
test-compat: backed out changeset 41fc764bf28c mercurial-4.6
Tue, 31 Jul 2018 11:47:20 +0200, by Pierre-Yves David
test-compat: backed out changeset dda5b2134b32 mercurial-4.6
Tue, 31 Jul 2018 11:46:30 +0200, by Pierre-Yves David
test-compat: backout change to 1e103c7f7663 mercurial-4.6
Tue, 31 Jul 2018 11:45:01 +0200, by Pierre-Yves David
compat: use older API for older version
Tue, 31 Jul 2018 11:25:57 +0200, by Pierre-Yves David
branching: create mercurial-4.6 branch for updated test output mercurial-4.6
Tue, 31 Jul 2018 09:28:19 +0200, by Pierre-Yves David
builddependencies: extract function for getting successors
Wed, 25 Jul 2018 16:12:01 -0700, by Martin von Zweigbergk
builddependencies: share code between single- and multi-successor cases
Wed, 25 Jul 2018 16:23:25 -0700, by Martin von Zweigbergk
builddependencies: build inverse dict from forward dict
Wed, 25 Jul 2018 14:33:48 -0700, by Martin von Zweigbergk
builddependencies: remove a use of defaultdict
Wed, 25 Jul 2018 14:21:49 -0700, by Martin von Zweigbergk
branching: merge with stable
Tue, 31 Jul 2018 09:03:35 +0200, by Pierre-Yves David
builddependencies: don't remove found deps when divergence found (issue5946) stable
Wed, 25 Jul 2018 15:30:37 -0700, by Martin von Zweigbergk
builddependencies: don't add dependency on revision outside input set stable
Wed, 25 Jul 2018 14:47:16 -0700, by Martin von Zweigbergk
builddependencies: consider all divergent successors stable
Wed, 25 Jul 2018 15:16:25 -0700, by Martin von Zweigbergk
tests: add test for issue5946 stable
Wed, 25 Jul 2018 14:00:49 -0700, by Martin von Zweigbergk
obslog: check filtered output with folded changesets
Fri, 25 May 2018 17:17:56 +0200, by Boris Feld
obslog: check filtered output with splitted changesets
Fri, 25 May 2018 16:50:04 +0200, by Boris Feld
obslog: check filtered output with pruned changesets
Fri, 25 May 2018 11:52:48 +0200, by Boris Feld
obslog: check filtered output with amended changesets
Tue, 22 May 2018 16:48:35 +0200, by Boris Feld
tests: add a content-divergent obshistory test
Fri, 25 May 2018 11:48:19 +0200, by Boris Feld
tests: extract the obshistory amend then fold test case into a separate file
Tue, 22 May 2018 17:44:05 +0200, by Boris Feld
tests: extract the content-divergence test case into a separate file
Tue, 22 May 2018 17:42:56 +0200, by Boris Feld
tests: extract the obshistory fold test case into a separate file
Tue, 22 May 2018 17:41:57 +0200, by Boris Feld
tests: extract the obshistory lots of split test case into a separate file
Tue, 22 May 2018 17:40:56 +0200, by Boris Feld
tests: extract the obshistory split test case into a separate file
Tue, 22 May 2018 17:37:51 +0200, by Boris Feld
tests: extract the obshistory prune test case into a separate file
Tue, 22 May 2018 17:37:40 +0200, by Boris Feld
tests: extract the obshistory amend test case into a separate file
Tue, 22 May 2018 15:40:29 +0200, by Boris Feld
tests: extract obshistory setup in a separate file
Tue, 22 May 2018 15:35:54 +0200, by Boris Feld
obslog: add a new flag to filter out non-local nodes
Tue, 22 May 2018 12:07:24 +0200, by Boris Feld
compat: drop compatibility hack for mercurial <4.3
Thu, 26 Jul 2018 18:28:44 +0200, by Pierre-Yves David
compat: temporarily move copies fix to compat.py
Sat, 21 Jul 2018 02:42:29 +0530, by Pulkit Goyal
evolve: continue conflicted relocation content-divergence
Thu, 07 Jun 2018 18:18:30 +0530, by Pulkit Goyal
topic: use self instead of repo in topicrepo methods stable
Wed, 18 Jul 2018 18:17:16 +0800, by Anton Shestakov
evolvecmd: introduce fn to be wrapped by extensions resolving content-div
Sun, 08 Jul 2018 22:16:17 +0530, by Pulkit Goyal
evolvecmd: move remaining logic to merge commit desc to existing utility fn
Sun, 08 Jul 2018 21:18:33 +0530, by Pulkit Goyal
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
Sun, 08 Jul 2018 22:52:33 +0530, by Pulkit Goyal
tests: add a test to demonstrate issue5925
Sun, 08 Jul 2018 22:50:16 +0530, by Pulkit Goyal
test: fix possible output change from 4.7
Mon, 09 Jul 2018 01:18:40 +0200, by Pierre-Yves David
state: add the get() method that evolvecmd:1836 expects
Fri, 06 Jul 2018 11:36:24 -0700, by Martin von Zweigbergk
rewing: prevent rewind in case of uncommitted changes
Sun, 17 Jun 2018 03:56:54 +0200, by Pierre-Yves David
rewind: default to rewinding the current stack
Sun, 17 Jun 2018 03:46:46 +0200, by Pierre-Yves David
rewing: add the ability to rewind "from" revisions
Sun, 17 Jun 2018 03:10:19 +0200, by Pierre-Yves David
evolve: exclude "identical" precursors from the precursors set
Sun, 17 Jun 2018 03:29:34 +0200, by Pierre-Yves David
rewind: move revision selection into its own function
Sun, 17 Jun 2018 03:07:53 +0200, by Pierre-Yves David
rewind: automatically rewind entire stack
Sun, 17 Jun 2018 02:32:29 +0200, by Pierre-Yves David
rewind: add a test about rewinding top of stack
Sun, 17 Jun 2018 02:22:28 +0200, by Pierre-Yves David
rewind: use rewinded parent when creating multiple changesets
Sun, 17 Jun 2018 02:03:03 +0200, by Pierre-Yves David
rewind: add a test for rewinding a fold
Sun, 17 Jun 2018 00:22:31 +0200, by Pierre-Yves David
rewind: add a test for rewinding a split
Sun, 17 Jun 2018 01:36:30 +0200, by Pierre-Yves David
rewind: update the working copy if it gets obsoleted
Sun, 17 Jun 2018 00:33:43 +0200, by Pierre-Yves David
rewind: add a message about obsolete changeset
Sun, 17 Jun 2018 01:04:20 +0200, by Pierre-Yves David
rewind: obsolete latest successors unless instructed otherwise
Sun, 17 Jun 2018 00:15:18 +0200, by Pierre-Yves David
rewind: test rewinding an amended changesets
Sat, 16 Jun 2018 23:32:22 +0200, by Pierre-Yves David
rewind: add a message about the rewinded changesets
Sun, 17 Jun 2018 00:57:09 +0200, by Pierre-Yves David
rewind: add a proto version of the command
Sat, 16 Jun 2018 23:11:52 +0200, by Pierre-Yves David
stablesort: make sure heads are processed in sorted order
Fri, 29 Jun 2018 16:51:56 +0200, by Pierre-Yves David
evolve: move the bookmarks also when updating to successor (issue5923)
Tue, 19 Jun 2018 23:21:54 +0530, by Pulkit Goyal
tests: add test to demonstrate issue5923
Tue, 19 Jun 2018 23:21:44 +0530, by Pulkit Goyal
changelog: add an entry about the new `evolve.interrupted` section
Thu, 28 Jun 2018 17:26:16 +0200, by Pierre-Yves David
evolve: make one missed error to align other error messages
Fri, 15 Jun 2018 00:50:17 +0530, by Pulkit Goyal
evolve: raise error.InterventionRequired instead of Abort when conflicts
Fri, 15 Jun 2018 00:16:29 +0530, by Pulkit Goyal
changelog: add a changelog entry about divergence resolution
Thu, 14 Jun 2018 02:58:30 +0200, by Pierre-Yves David
evolve: create resolved cset on successors of current parents
Thu, 14 Jun 2018 01:39:33 +0530, by Pulkit Goyal
tests: fix a test case to not create conflicts
Thu, 14 Jun 2018 01:39:11 +0530, by Pulkit Goyal
evolve: introduce a resolutionparent variable and store it in evolvestate
Thu, 14 Jun 2018 01:06:12 +0530, by Pulkit Goyal
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
Wed, 13 Jun 2018 18:08:57 +0530, by Pulkit Goyal
evolve: create a new commit instead of amending one of the divergents
Wed, 13 Jun 2018 17:15:10 +0530, by Pulkit Goyal
evolve: always order the revs to be evolved
Tue, 12 Jun 2018 23:20:54 +0530, by Pulkit Goyal
tests: add test of resolution of content-divergent stacks
Tue, 12 Jun 2018 21:13:02 +0530, by Pulkit Goyal
evolve: improve error messages when conflicts occur
Tue, 12 Jun 2018 19:00:12 +0530, by Pulkit Goyal
evolve: point to `hg help evolve.interrupted` while resolving content-div
Tue, 12 Jun 2018 04:01:19 +0530, by Pulkit Goyal
tests: add test about aborting content-divergence when multiple parents
Tue, 12 Jun 2018 03:29:13 +0530, by Pulkit Goyal
CHANGELOG: add an entry about the --update flag
Wed, 13 Jun 2018 15:47:19 +0530, by Pulkit Goyal
evolve: show unfinished information in `hg status -v` (issue5886)
Wed, 06 Jun 2018 04:29:05 +0530, by Pulkit Goyal
style: drop a (commented) debug print
Tue, 12 Jun 2018 13:58:14 +0200, by Denis Laxalde
tests: update tests output with changes in d0abd7949ea3 in core hg
Sun, 10 Jun 2018 20:58:55 +0530, by Pulkit Goyal
branching: merge with stable
Tue, 12 Jun 2018 10:40:57 +0200, by Pierre-Yves David
Added tag 8.0.1 for changeset 0887c30255a1 stable
Mon, 11 Jun 2018 23:31:44 +0530, by Pulkit Goyal
packaging: prepare for 8.0.1 release stable 8.0.1
Mon, 11 Jun 2018 23:30:24 +0530, by Pulkit Goyal
changelog: add a couple of missing entry stable
Mon, 11 Jun 2018 20:24:45 +0200, by Pierre-Yves David
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Mon, 11 Jun 2018 20:17:56 +0530, by Pulkit Goyal
evolve: store the obsmarkers to be deleted in evolvestate
Mon, 11 Jun 2018 20:13:36 +0530, by Pulkit Goyal
evolve: store obsmarkers to be deleted in evolvestate
Mon, 11 Jun 2018 15:52:11 +0530, by Pulkit Goyal
evolve: factor out logic to merge branches in separate function
Mon, 11 Jun 2018 15:38:43 +0530, by Pulkit Goyal
tests: add more test of --stop while resolving content-divergence
Mon, 11 Jun 2018 01:00:57 +0530, by Pulkit Goyal
evolve: strip the relocation commit on `hg evolve --stop`
Mon, 11 Jun 2018 00:47:28 +0530, by Pulkit Goyal
evolve: declare updated and pctx variables in stopevolve()
Mon, 11 Jun 2018 00:43:39 +0530, by Pulkit Goyal
evolve: store the old other divergent node after relocation in evolvestate
Sun, 10 Jun 2018 22:52:11 +0530, by Pulkit Goyal
evolve: factor out logic for --stop flag in separate function
Sun, 10 Jun 2018 22:42:57 +0530, by Pulkit Goyal
tests: add test for --stop flag when resolving multiparents content-div
Sun, 10 Jun 2018 22:38:08 +0530, by Pulkit Goyal
evolve: move logic to continue interrupted content-div resolution to new fn
Sun, 10 Jun 2018 20:35:48 +0530, by Pulkit Goyal
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
Mon, 11 Jun 2018 01:12:12 +0530, by Pulkit Goyal

less more | rev 3940: (0) -3000 -1000 -120 +120 +1000 tip

Mercurial > evolve

graph