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