evolve: revision graph

graph

less more | rev 3932: (0) -3000 -1000 -240 +240 +1000 +3000 tip

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
packaging: update tested-with statements in evolve and topic stable
Sat, 09 Jun 2018 00:15:27 +0530, by Pulkit Goyal
CHANGELOG: mention about 4.6.1 compatibility stable
Sat, 09 Jun 2018 00:12:08 +0530, by Pulkit Goyal
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Fri, 08 Jun 2018 22:52:53 +0530, by Pulkit Goyal
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 08 Jun 2018 22:52:52 +0530, by Pulkit Goyal
test-compat: merge stable into mercurial-4.5 mercurial-4.5
Fri, 08 Jun 2018 22:52:51 +0530, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value stable
Tue, 22 May 2018 23:51:57 +0530, by Pulkit Goyal
CHANGELOG: add couple of entries about things fixed stable
Fri, 08 Jun 2018 19:48:53 +0530, by Pulkit Goyal
next-prev: always respect the --merge flag stable
Fri, 08 Jun 2018 17:36:28 +0530, by Pulkit Goyal
next-prev: add tests showing --merge not respected in some cases stable
Fri, 08 Jun 2018 18:32:48 +0530, by Pulkit Goyal
evolve: store the evolvestate if relocation results in conflicts
Thu, 07 Jun 2018 22:59:39 +0530, by Pulkit Goyal
tests: add more test of resolution of content-divergent changesets
Thu, 07 Jun 2018 22:45:54 +0530, by Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
Thu, 07 Jun 2018 18:18:10 +0530, by Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
Thu, 07 Jun 2018 18:13:54 +0530, by Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
Thu, 07 Jun 2018 20:27:03 +0530, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
Thu, 07 Jun 2018 15:54:32 +0530, by Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
Fri, 01 Jun 2018 19:52:06 +0530, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
Fri, 01 Jun 2018 19:57:19 +0530, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
Wed, 06 Jun 2018 03:49:17 +0530, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
Wed, 06 Jun 2018 03:26:47 +0530, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
Mon, 04 Jun 2018 01:28:02 +0530, by Pulkit Goyal
evolve: move if-else block under the right block
Wed, 06 Jun 2018 01:19:36 +0530, by Pulkit Goyal
tests: make sure we don't result in commit messages conflict
Tue, 05 Jun 2018 22:02:24 +0530, by Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
Tue, 05 Jun 2018 21:02:09 +0530, by Pulkit Goyal
evolve: remove duplicated documentation
Wed, 06 Jun 2018 14:35:36 +0200, by Pierre-Yves David
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
Wed, 06 Jun 2018 04:09:49 +0530, by Pulkit Goyal
evolve: add a help topic `Interrupted-Evolve`
Wed, 23 May 2018 01:11:59 +0530, by Pulkit Goyal
branching: merge with stable
Tue, 05 Jun 2018 03:37:15 +0200, by Pierre-Yves David
changelog: fix version number error stable
Tue, 05 Jun 2018 03:36:40 +0200, by Pierre-Yves David
evolve: return the new node formed only as the replacement
Thu, 24 May 2018 02:12:14 +0530, by Pulkit Goyal
tests: add more test of --abort flag for content-divergence resolution
Thu, 24 May 2018 17:04:20 +0530, by Pulkit Goyal
evolve: prompt user for branch selection while resolving content-divergence
Mon, 04 Jun 2018 04:03:02 +0530, by Pulkit Goyal
evolve: pass the base revision in _completecontentdivergent()
Tue, 05 Jun 2018 03:51:01 +0530, by Pulkit Goyal
evolve: store the base of content-divergents in evolvestate
Tue, 05 Jun 2018 03:49:49 +0530, by Pulkit Goyal
evolve: use cmdrewrite.amend() instead of creating a new commit
Tue, 05 Jun 2018 00:53:21 +0530, by Pulkit Goyal
corecompat: update the tests output to show phase update summary
Sun, 03 Jun 2018 01:59:41 +0530, by Pulkit Goyal
CHANGELOG: add an entry about issue 5808 being fixed stable
Sun, 03 Jun 2018 03:24:43 +0530, by Pulkit Goyal
next-prev: replace the error hint to mention about `--merge` flag stable
Sun, 03 Jun 2018 03:21:25 +0530, by Pulkit Goyal
tests: add tests for conflicts while respecting commands.update.check stable
Sun, 03 Jun 2018 03:13:47 +0530, by Pulkit Goyal
next: respect `commands.update.check` config option in `hg next` (issue5808) stable
Sun, 03 Jun 2018 02:37:13 +0530, by Pulkit Goyal
prev: respect `commands.update.check` config option in `hg prev` (issue5808) stable
Sun, 03 Jun 2018 02:36:24 +0530, by Pulkit Goyal
tests: add test demonstrating issue5808 stable
Sun, 03 Jun 2018 02:50:55 +0530, by Pulkit Goyal
next: bail out early in `hg next --evolve` if dirty wdir stable
Sun, 03 Jun 2018 02:26:19 +0530, by Pulkit Goyal
tests: add test of `hg next --evolve` with dirty working directory stable
Sun, 03 Jun 2018 02:24:28 +0530, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5897 stable
Sun, 03 Jun 2018 03:35:22 +0530, by Pulkit Goyal
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) stable
Sun, 27 May 2018 02:32:58 +0530, by Pulkit Goyal
tests: add a test demonstrating issue5897 stable
Wed, 30 May 2018 00:34:35 +0530, by Pulkit Goyal
evolve: add an `--update` flag to `hg evolve` command
Thu, 24 May 2018 17:50:02 +0530, by Pulkit Goyal
tests: add tests for testing --abort while content-divergence resolution
Thu, 24 May 2018 02:02:11 +0530, by Pulkit Goyal
evolve: fix storage of replacements and temprevs node in evolvestate
Thu, 24 May 2018 00:58:50 +0530, by Pulkit Goyal
tests: add more tests related to aborting while resolving phase-divergence
Thu, 24 May 2018 00:58:35 +0530, by Pulkit Goyal
topic: suggest to clear a topic that becomes empty
Wed, 23 May 2018 12:16:24 +0200, by Denis Laxalde
topic: display a hint pointing at help when a topic becomes non-empty
Wed, 23 May 2018 11:37:37 +0200, by Denis Laxalde
branching: merge with compat fix on default
Thu, 24 May 2018 18:57:46 +0200, by Pierre-Yves David
evolve: add compat for repair.stripbmrevset which is moved to scmutil stable
Thu, 24 May 2018 01:50:26 +0530, by Pulkit Goyal
evolve: update the readme with more information about contribution stable
Wed, 23 May 2018 11:18:14 +0200, by Pierre-Yves David
topic: dedent items about publishing behavior in docstring stable
Wed, 23 May 2018 11:03:31 +0200, by Denis Laxalde
topic: use preformatted block for config snippets documentation stable
Wed, 23 May 2018 11:00:11 +0200, by Denis Laxalde
tests: add a test for "hg help -e topic" stable
Wed, 23 May 2018 11:09:37 +0200, by Denis Laxalde
branching: merge with stable
Wed, 23 May 2018 01:24:02 +0200, by Pierre-Yves David
content-div: add test showing `--stop` works during interrupted resolution
Tue, 22 May 2018 21:33:50 +0530, by Pulkit Goyal
evolve: create new commit while resolving content-divergence
Mon, 23 Apr 2018 14:48:53 +0530, by Pulkit Goyal
content-divergence: store the resolved revs in evolvestate['replacements']
Tue, 22 May 2018 20:33:42 +0530, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value
Tue, 22 May 2018 23:51:57 +0530, by Pulkit Goyal
evolve: make `--abort` strip the temporary revs created during resolution
Wed, 23 May 2018 02:46:20 +0530, by Pulkit Goyal
evolve: store a list of temprevs in evolvestate
Wed, 23 May 2018 02:43:23 +0530, by Pulkit Goyal
evolve: check for None before adding in set of revisions to strip
Wed, 23 May 2018 02:36:14 +0530, by Pulkit Goyal
evolve: return the new replacement node to be stored in evolvestate
Wed, 23 May 2018 02:33:14 +0530, by Pulkit Goyal
evolve: don't make values of replacements dict lists
Wed, 23 May 2018 02:39:38 +0530, by Pulkit Goyal
tests: add a test file `--abort` flag while resolving phase-divergence
Wed, 23 May 2018 02:41:08 +0530, by Pulkit Goyal
evolve: pass revisions as strings to commands.*() stable
Tue, 15 May 2018 22:17:27 -0700, by Martin von Zweigbergk
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
Wed, 23 May 2018 01:27:13 +0530, by Pulkit Goyal
branching: merge with branch for stable
Mon, 21 May 2018 16:56:52 +0200, by Pierre-Yves David
compat: update obshashrange test output
Mon, 21 May 2018 16:25:29 +0200, by Boris Feld
test: update to new outputs
Mon, 21 May 2018 14:56:51 +0200, by Boris Feld
compat: fix obslog with Mercurial 4.6+
Mon, 21 May 2018 13:07:49 +0200, by Boris Feld
debian: add line to clean-docs target to delete additional docs file stable
Sat, 19 May 2018 18:26:36 +0530, by Faheem Mitha
amend: use context manager for locks (issue5887) stable
Mon, 14 May 2018 15:25:38 -0700, by Martin von Zweigbergk
evolve: point to '--abort' in verbose status message stable
Thu, 10 May 2018 21:37:28 -0700, by Martin von Zweigbergk
evolvecmd: add comments and new lines in content-divergence handling logic
Sun, 22 Apr 2018 20:14:42 +0530, by Pulkit Goyal
evolve: show cset hash in "merging conetnt-divergent changeset"
Sun, 29 Apr 2018 19:18:54 +0530, by Pulkit Goyal
evolve: show cset hash in "update to local conflict" message
Sun, 29 Apr 2018 19:14:41 +0530, by Pulkit Goyal
evolve: use hg.updaterepo() instead of hg.update() to hide stats
Sun, 29 Apr 2018 19:11:29 +0530, by Pulkit Goyal
evolve: fix the conflicts error message during content-divergence resolution
Sun, 29 Apr 2018 19:04:18 +0530, by Pulkit Goyal
evolve: add logic to continue interrupted content-divergence resolution
Sun, 29 Apr 2018 18:51:56 +0530, by Pulkit Goyal
evolve: store the evolvestate file when encountering conflicts
Sun, 29 Apr 2018 18:48:36 +0530, by Pulkit Goyal
evolve: take out logic to complete phase-divergence in separate fn
Sun, 29 Apr 2018 18:13:29 +0530, by Pulkit Goyal
evolve: store divergent nodes in evolvestate when resolving content-divergence
Sun, 29 Apr 2018 17:54:01 +0530, by Pulkit Goyal
branching: merge stable into default
Wed, 02 May 2018 11:59:06 +0200, by Pierre-Yves David
tests: add test showing `hg evolve --stop` works fine with phase-divergence stable
Sat, 28 Apr 2018 18:44:07 +0530, by Pulkit Goyal
tests: rename the test file to add 'orphan' in the name stable
Sat, 28 Apr 2018 18:03:32 +0530, by Pulkit Goyal
tests: test that `hg obslog wdir()` aborts with a useful message stable
Fri, 27 Apr 2018 16:28:34 +0800, by Anton Shestakov
obshistory: make obslog work when a commit doesn't have any description stable
Fri, 27 Apr 2018 16:19:45 +0800, by Anton Shestakov
obshistory: use a more appropriate type for obslog entries stable
Fri, 27 Apr 2018 16:14:10 +0800, by Anton Shestakov
packaging: mark as development version
Wed, 25 Apr 2018 14:19:13 +0100, by Pierre-Yves David
branching: merge with latest release
Wed, 25 Apr 2018 14:18:19 +0100, by Pierre-Yves David
packaking: mark as development version stable
Wed, 25 Apr 2018 14:16:35 +0100, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Wed, 25 Apr 2018 14:09:36 +0100, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 25 Apr 2018 14:09:35 +0100, by Pierre-Yves David
test-compat: merge stable into mercurial-4.5 mercurial-4.5
Wed, 25 Apr 2018 14:09:34 +0100, by Pierre-Yves David
Added tag 8.0.0 for changeset 116cdd8c102a stable
Wed, 25 Apr 2018 14:09:14 +0100, by Pierre-Yves David
packaging: update version number stable 8.0.0
Wed, 25 Apr 2018 14:02:43 +0100, by Pierre-Yves David
packagin: update `tested-with` statement stable
Wed, 25 Apr 2018 13:55:52 +0100, by Pierre-Yves David
changelog: mention 4.6 compatibility stable
Wed, 25 Apr 2018 13:49:00 +0100, by Pierre-Yves David
Changelog: pre-version gardening stable
Wed, 25 Apr 2018 11:55:49 +0100, by Pierre-Yves David
testcompat: update output for Mercurial 4.3 mercurial-4.3
Wed, 25 Apr 2018 01:58:45 +0100, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 23 Apr 2018 12:23:00 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Mon, 23 Apr 2018 12:11:10 +0200, by Pierre-Yves David
testcompat: revert output change from new capabilities mercurial-4.5
Tue, 24 Apr 2018 08:57:18 +0100, by Pierre-Yves David
testcompat: revert output change from 54a469cd5b26 mercurial-4.5
Tue, 24 Apr 2018 08:42:47 +0100, by Pierre-Yves David
testcompat: revert output change from 1de6ba0ac6d7 mercurial-4.5
Tue, 24 Apr 2018 08:41:57 +0100, by Pierre-Yves David
testcompat: merge stable into mercurial-4.5 mercurial-4.5
Mon, 23 Apr 2018 12:10:26 +0200, by Pierre-Yves David
compat: handle different `ui.edit` signature with Mercurial 4.3 stable
Tue, 24 Apr 2018 15:23:15 +0100, by Pierre-Yves David
wirepeer: try modern module first stable
Tue, 24 Apr 2018 16:13:42 +0100, by Pierre-Yves David
compat: handle lack of allpredecessors for Mercurial 4.3 stable
Tue, 24 Apr 2018 12:07:35 +0100, by Pierre-Yves David
branching: merge further fix into stable stable
Mon, 23 Apr 2018 12:03:05 +0100, by Pierre-Yves David
wrapping: fix a silly error were we checking on module and wrapping the other
Mon, 23 Apr 2018 11:44:05 +0100, by Pierre-Yves David
brancing: merge next release into default stable
Mon, 23 Apr 2018 11:04:27 +0200, by Pierre-Yves David
test-compat: open mercurial-4.5 branch mercurial-4.5
Sat, 21 Apr 2018 11:01:12 +0200, by Pierre-Yves David
evolve: point to '--abort' in error message
Sun, 22 Apr 2018 11:40:17 +0200, by Pierre-Yves David
compat: drop compatibility layer for pager
Thu, 19 Apr 2018 16:27:13 +0200, by Pierre-Yves David
compat: drop compatibility layer for duplicatecopies
Thu, 19 Apr 2018 16:25:17 +0200, by Pierre-Yves David
compat: drop compatibility layer for bookmark.applychanges
Thu, 19 Apr 2018 16:21:44 +0200, by Pierre-Yves David
compat: from compatibility layer for allprecursors
Thu, 19 Apr 2018 16:15:10 +0200, by Pierre-Yves David
compat: drop compatibility layer for successorssets
Thu, 19 Apr 2018 16:12:37 +0200, by Pierre-Yves David
compat: drop compatibility wrapper for "relevantmarkers"
Thu, 19 Apr 2018 16:08:01 +0200, by Pierre-Yves David
compat: drop compat layer for cleanupnodes
Thu, 19 Apr 2018 16:51:53 +0200, by Pierre-Yves David
compat: from compatibility layer for createmarkers
Thu, 19 Apr 2018 16:07:23 +0200, by Pierre-Yves David
compat: drop obsutile layer
Thu, 19 Apr 2018 16:01:49 +0200, by Pierre-Yves David

less more | rev 3932: (0) -3000 -1000 -240 +240 +1000 +3000 tip

Mercurial > evolve

graph