| Wed, 25 Jul 2018 14:21:49 -0700 |
Martin von Zweigbergk |
builddependencies: remove a use of defaultdict
|
| Tue, 31 Jul 2018 09:03:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Wed, 25 Jul 2018 15:30:37 -0700 |
Martin von Zweigbergk |
builddependencies: don't remove found deps when divergence found (issue5946)
stable
|
| Wed, 25 Jul 2018 14:47:16 -0700 |
Martin von Zweigbergk |
builddependencies: don't add dependency on revision outside input set
stable
|
| Wed, 25 Jul 2018 15:16:25 -0700 |
Martin von Zweigbergk |
builddependencies: consider all divergent successors
stable
|
| Wed, 25 Jul 2018 14:00:49 -0700 |
Martin von Zweigbergk |
tests: add test for issue5946
stable
|
| Fri, 25 May 2018 17:17:56 +0200 |
Boris Feld |
obslog: check filtered output with folded changesets
|
| Fri, 25 May 2018 16:50:04 +0200 |
Boris Feld |
obslog: check filtered output with splitted changesets
|
| Fri, 25 May 2018 11:52:48 +0200 |
Boris Feld |
obslog: check filtered output with pruned changesets
|
| Tue, 22 May 2018 16:48:35 +0200 |
Boris Feld |
obslog: check filtered output with amended changesets
|
| Fri, 25 May 2018 11:48:19 +0200 |
Boris Feld |
tests: add a content-divergent obshistory test
|
| Tue, 22 May 2018 17:44:05 +0200 |
Boris Feld |
tests: extract the obshistory amend then fold test case into a separate file
|
| Tue, 22 May 2018 17:42:56 +0200 |
Boris Feld |
tests: extract the content-divergence test case into a separate file
|
| Tue, 22 May 2018 17:41:57 +0200 |
Boris Feld |
tests: extract the obshistory fold test case into a separate file
|
| Tue, 22 May 2018 17:40:56 +0200 |
Boris Feld |
tests: extract the obshistory lots of split test case into a separate file
|
| Tue, 22 May 2018 17:37:51 +0200 |
Boris Feld |
tests: extract the obshistory split test case into a separate file
|
| Tue, 22 May 2018 17:37:40 +0200 |
Boris Feld |
tests: extract the obshistory prune test case into a separate file
|
| Tue, 22 May 2018 15:40:29 +0200 |
Boris Feld |
tests: extract the obshistory amend test case into a separate file
|
| Tue, 22 May 2018 15:35:54 +0200 |
Boris Feld |
tests: extract obshistory setup in a separate file
|
| Tue, 22 May 2018 12:07:24 +0200 |
Boris Feld |
obslog: add a new flag to filter out non-local nodes
|
| Thu, 26 Jul 2018 18:28:44 +0200 |
Pierre-Yves David |
compat: drop compatibility hack for mercurial <4.3
|
| Sat, 21 Jul 2018 02:42:29 +0530 |
Pulkit Goyal |
compat: temporarily move copies fix to compat.py
|
| Thu, 07 Jun 2018 18:18:30 +0530 |
Pulkit Goyal |
evolve: continue conflicted relocation content-divergence
|
| Wed, 18 Jul 2018 18:17:16 +0800 |
Anton Shestakov |
topic: use self instead of repo in topicrepo methods
stable
|
| Sun, 08 Jul 2018 22:16:17 +0530 |
Pulkit Goyal |
evolvecmd: introduce fn to be wrapped by extensions resolving content-div
|
| Sun, 08 Jul 2018 21:18:33 +0530 |
Pulkit Goyal |
evolvecmd: move remaining logic to merge commit desc to existing utility fn
|
| Sun, 08 Jul 2018 22:52:33 +0530 |
Pulkit Goyal |
amend: allow aborting an `amend --patch` by saving an empty file (issue5925)
|
| Sun, 08 Jul 2018 22:50:16 +0530 |
Pulkit Goyal |
tests: add a test to demonstrate issue5925
|
| Mon, 09 Jul 2018 01:18:40 +0200 |
Pierre-Yves David |
test: fix possible output change from 4.7
|
| Fri, 06 Jul 2018 11:36:24 -0700 |
Martin von Zweigbergk |
state: add the get() method that evolvecmd:1836 expects
|
| Sun, 17 Jun 2018 03:56:54 +0200 |
Pierre-Yves David |
rewing: prevent rewind in case of uncommitted changes
|
| Sun, 17 Jun 2018 03:46:46 +0200 |
Pierre-Yves David |
rewind: default to rewinding the current stack
|
| Sun, 17 Jun 2018 03:10:19 +0200 |
Pierre-Yves David |
rewing: add the ability to rewind "from" revisions
|
| Sun, 17 Jun 2018 03:29:34 +0200 |
Pierre-Yves David |
evolve: exclude "identical" precursors from the precursors set
|
| 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
|
