| Wed, 17 Jul 2019 18:06:14 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 17:58:44 +0200 |
Sushil khanchi |
touch: fix the inconsistent behavior of divergence catching logic (issue6107)
stable
|
file |
diff |
annotate
|
| Sat, 13 Jul 2019 18:22:34 +0800 |
Anton Shestakov |
metaedit: allow operations on merge commits with some conditions
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 18:07:03 +0800 |
Anton Shestakov |
fold: allow operations on merge commits with some conditions
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 17:04:08 +0800 |
Anton Shestakov |
rewind: make sure merge commits include files from p1 and p2
|
file |
diff |
annotate
|
| Tue, 09 Jul 2019 17:08:34 +0800 |
Anton Shestakov |
rewriteutil: allow rewriting merge commits (issue4561)
|
file |
diff |
annotate
|
| Thu, 04 Jul 2019 16:55:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 25 Jun 2019 21:54:22 +0530 |
Sushil khanchi |
evolve: fix confusion in branch heads checking logic when topic in play
|
file |
diff |
annotate
|
| Mon, 01 Jul 2019 19:15:57 +0530 |
Sushil khanchi |
evolve: fix the inconsistent behaviour of prune (issue6137)
stable
|
file |
diff |
annotate
|
| Sun, 16 Jun 2019 23:39:55 +0530 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
file |
diff |
annotate
|
| Fri, 14 Jun 2019 18:17:03 +0800 |
Anton Shestakov |
pick: register pickstate as an unfinished state
stable
|
file |
diff |
annotate
|
| Tue, 18 Jun 2019 17:17:31 +0800 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
file |
diff |
annotate
|
| Fri, 07 Jun 2019 18:14:48 +0800 |
Anton Shestakov |
pick: remove transaction on the whole command (issue6037)
stable
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:09:37 +0800 |
Anton Shestakov |
evolve: correct action verb in a message
|
file |
diff |
annotate
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
file |
diff |
annotate
|
| Thu, 06 Jun 2019 14:24:19 +0200 |
Pierre-Yves David |
packaging: prepare release 9.0.0
stable 9.0.0
|
file |
diff |
annotate
|
| Thu, 06 Jun 2019 13:26:44 +0200 |
Pierre-Yves David |
changelog: add various missing bits
stable
|
file |
diff |
annotate
|
| Mon, 27 May 2019 03:42:35 +0200 |
Pierre-Yves David |
topic: add a simple option to reject publishing
|
file |
diff |
annotate
|
| Mon, 27 May 2019 01:53:36 +0200 |
Pierre-Yves David |
obsdiscovery: drop `obshash` discovery protocol (issue6136)
|
file |
diff |
annotate
|
| Mon, 27 May 2019 02:42:11 +0200 |
Pierre-Yves David |
changelog: mention user merging in the changelog
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 17:11:12 +0800 |
Anton Shestakov |
changelog: --no-update is the default, recommend --update instead
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 01:18:08 +0300 |
Pulkit Goyal |
topic: drop support for accessing csets in branch stack using bxx (issue6119)
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 18:20:33 +0800 |
Anton Shestakov |
stack: rename troubledcount to unstablecount
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 14:38:26 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 15:30:39 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.1
stable 8.5.1
|
file |
diff |
annotate
|
| Mon, 22 Apr 2019 22:14:26 -0700 |
Martin von Zweigbergk |
evolve: fix progress display with hg<4.7
stable
|
file |
diff |
annotate
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 12:24:22 +0200 |
Pierre-Yves David |
compat: drop support for Mercurial 4.4
|
file |
diff |
annotate
|
| Tue, 23 Apr 2019 12:20:12 +0200 |
Pierre-Yves David |
compat: backed out changeset cfcb7eedc666
stable
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 10:31:53 +0530 |
Sushil khanchi |
compat: fix a typo in compat patch
stable
|
file |
diff |
annotate
|
| Thu, 18 Apr 2019 23:51:13 +0200 |
Pierre-Yves David |
changelog: mention extensions isolation (issue6121)
stable
|
file |
diff |
annotate
|
| Wed, 17 Apr 2019 21:39:28 +0200 |
Pierre-Yves David |
changelog: mention topic compatibility
stable
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 02:15:24 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.0
stable 8.5.0
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 22:41:06 +0200 |
Pierre-Yves David |
changelog: merge 8.4.1 and 8.5.1 entries
stable
|
file |
diff |
annotate
|
| Tue, 02 Apr 2019 22:42:01 -0400 |
Matt Harbison |
uncommit: abort if an explicitly given file cannot be uncommitted (BC)
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 17:45:36 +0800 |
Anton Shestakov |
evolve: store --update flag state in evolvestate file
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 21:19:01 +0200 |
Pierre-Yves David |
changelog: mention Martin work on phase-divergence
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Sun, 07 Apr 2019 19:53:53 +0200 |
Joerg Sonnenberger |
evolve: when using evolve, cache files belong into the master repo
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 16:11:59 +0200 |
Pierre-Yves David |
changelog: mention issue6089 fix
stable
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
file |
diff |
annotate
|
| Tue, 09 Apr 2019 21:16:49 +0200 |
Pierre-Yves David |
changelog: mention the fix to issue6057
stable
|
file |
diff |
annotate
|
| Tue, 26 Mar 2019 11:23:09 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Mon, 25 Mar 2019 15:45:11 -0700 |
Martin von Zweigbergk |
touch: use action "touch", not "<function touch at ...>", in precheck
stable
|
file |
diff |
annotate
|
| Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
file |
diff |
annotate
|
| Sun, 10 Mar 2019 18:00:08 +0100 |
Pierre-Yves David |
changelog: mention latest improvement
|
file |
diff |
annotate
|
| Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Mon, 04 Mar 2019 11:54:49 +0100 |
Pierre-Yves David |
changelog: add entries for the recent fixes
stable
|
file |
diff |
annotate
|
| Sun, 03 Feb 2019 17:03:02 +0530 |
Sangeet Kumar Mishra |
pick: add --tool for hg pick to specify mergetool
|
file |
diff |
annotate
|
| Wed, 30 Jan 2019 04:45:40 +0100 |
Pierre-Yves David |
changelog: add relevant entries
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 20:25:36 -0500 |
Pierre-Yves David |
packaging: prepare release 8.4.0
stable 8.4.0
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 12:50:54 -0500 |
Pierre-Yves David |
changelog: explicit the part related to topic
stable
|
file |
diff |
annotate
|
| Thu, 17 Jan 2019 12:37:40 +0100 |
Pierre-Yves David |
obsdiscovery: use consistent filtering during discovery
|
file |
diff |
annotate
|
| Fri, 18 Jan 2019 23:09:44 +0530 |
Sushil khanchi |
evolve: make sure we don't stop after evolution of obsparent (issue5881)
|
file |
diff |
annotate
|
| Fri, 18 Jan 2019 13:54:30 +0530 |
Sushil khanchi |
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
|
file |
diff |
annotate
|
| Tue, 25 Dec 2018 14:35:54 +0530 |
Sushil khanchi |
evolve: cover the orphanmerge part missed by lastsolved
|
file |
diff |
annotate
|