2019-07-17 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-07-17 |
Sushil khanchi |
touch: fix the inconsistent behavior of divergence catching logic (issue6107)
stable
|
changeset |
files
|
2019-06-29 |
Sushil khanchi |
touch: add test which shows touch can fail to warn about divergence
stable
|
changeset |
files
|
2019-07-17 |
Sushil khanchi |
touch: clarify some inline documentation
stable
|
changeset |
files
|
2019-07-15 |
Martin von Zweigbergk |
tests: update output for new branch cache messsages from Mercurial
|
changeset |
files
|
2019-07-13 |
Anton Shestakov |
metaedit: allow operations on merge commits with some conditions
|
changeset |
files
|
2019-07-11 |
Anton Shestakov |
fold: allow operations on merge commits with some conditions
|
changeset |
files
|
2019-07-11 |
Anton Shestakov |
rewind: make sure merge commits include files from p1 and p2
|
changeset |
files
|
2019-07-10 |
Anton Shestakov |
touch: make sure merge commits include files from p1 and p2
|
changeset |
files
|
2019-07-09 |
Martin von Zweigbergk |
py3: make `import hgext3rd.evolve` work
|
changeset |
files
|
2019-07-09 |
Martin von Zweigbergk |
py3: use bytes for template keyword registrations
|
changeset |
files
|
2019-07-09 |
Martin von Zweigbergk |
py3: convert _origdoc to sysstr to match __doc__
|
changeset |
files
|
2019-07-09 |
Martin von Zweigbergk |
py3: use bytes for revset predicate registrations
|
changeset |
files
|
2019-07-09 |
Martin von Zweigbergk |
py3: use bytes for wireprotocol command registration
|
changeset |
files
|
2019-07-09 |
Martin von Zweigbergk |
py3: use byte strings for @command registrations
|
changeset |
files
|
2019-07-03 |
Martin von Zweigbergk |
py3: switch from iteritems() to items()
|
changeset |
files
|
2019-07-03 |
Martin von Zweigbergk |
py3: make metadata values be byte strings as Mercurial expects
|
changeset |
files
|
2019-07-10 |
Martin von Zweigbergk |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
2019-07-11 |
Pierre-Yves David |
tests: update output for shorted prompts from Mercurial
|
changeset |
files
|
2019-07-09 |
Anton Shestakov |
rewriteutil: allow rewriting merge commits (issue4561)
|
changeset |
files
|
2019-07-09 |
Anton Shestakov |
tests: show what happens when trying to hg touch a merge commit
|
changeset |
files
|
2019-07-04 |
kevpeng |
evolve: further clarify that update is performed only when requested
stable
|
changeset |
files
|
2019-06-14 |
Sushil khanchi |
touch: let's not use util.acceptintervention() as it's not required
|
changeset |
files
|
2019-07-04 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-06-26 |
Sushil khanchi |
evolve: use right value for branch name when finding branch heads
|
changeset |
files
|
2019-06-25 |
Sushil khanchi |
evolve: fix confusion in branch heads checking logic when topic in play
|
changeset |
files
|
2019-04-14 |
Sushil khanchi |
topic: add tests to demonstrate topic confuses the branchhead checking logic
|
changeset |
files
|
2019-07-01 |
Sushil khanchi |
evolve: fix the inconsistent behaviour of prune (issue6137)
stable
|
changeset |
files
|
2019-07-02 |
Sushil khanchi |
prune: add tests to demonstrate issue6137
stable
|
changeset |
files
|
2019-06-30 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
2019-06-29 |
Anton Shestakov |
prune: update to the successor of wdir also with --pair/--biject (issue6142)
stable
|
changeset |
files
|
2019-06-22 |
Anton Shestakov |
tests: demonstrate prune --pair not moving bookmark correctly
stable
|
changeset |
files
|
2019-07-02 |
Pierre-Yves David |
oops: backed out changeset 7ac40b4ea24c
|
changeset |
files
|
2019-06-30 |
Sushil khanchi |
compat: fix `setupevolveunfinished` for upstream
|
changeset |
files
|
2019-06-16 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
changeset |
files
|
2019-06-09 |
Sushil khanchi |
evolve: refactor for consistent behavior of evolve when wdp is obsolete
|
changeset |
files
|
2019-06-15 |
Sushil khanchi |
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
|
changeset |
files
|
2019-06-14 |
Anton Shestakov |
pick: register pickstate as an unfinished state
stable
|
changeset |
files
|
2019-06-14 |
Anton Shestakov |
pick: rename variable for unfinishedstates
stable
|
changeset |
files
|
2019-06-14 |
Anton Shestakov |
pick: actually delete pickstate if --abort is given
stable
|
changeset |
files
|
2019-06-18 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
changeset |
files
|
2018-12-22 |
Anton Shestakov |
tests: demonstrate obsmarker creation after discarding conflicting changes
stable
|
changeset |
files
|
2019-06-07 |
Anton Shestakov |
pick: remove transaction on the whole command (issue6037)
stable
|
changeset |
files
|
2018-12-22 |
Anton Shestakov |
tests: demonstrate hg pick forgetting files after conflicts
stable
|
changeset |
files
|
2019-06-13 |
Anton Shestakov |
packaging: follow hg's supported python version (>= 2.7)
stable
|
changeset |
files
|
2019-06-13 |
Anton Shestakov |
packaging: require hg 4.5 also for usage, not just for building
stable
|
changeset |
files
|
2019-06-11 |
Philippe Pepiot |
packaging: require mercurial >= 4.5
stable
|
changeset |
files
|
2019-06-08 |
Sushil khanchi |
evolve: clarify why returning by adding inline doc
|
changeset |
files
|
2019-06-08 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
changeset |
files
|
2019-04-27 |
Sushil khanchi |
topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
|
changeset |
files
|
2019-06-08 |
Anton Shestakov |
pick: reduce configoverride() scope
|
changeset |
files
|
2019-06-08 |
Anton Shestakov |
evolve: correct action verb in a message
|
changeset |
files
|
2019-06-08 |
Anton Shestakov |
evolve: internationalize a message
|
changeset |
files
|
2019-06-06 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
2019-06-07 |
Pierre-Yves David |
branching: merge with 9.0.0
|
changeset |
files
|
2019-06-07 |
Pierre-Yves David |
branching: merge back with stable
|
changeset |
files
|
2019-06-07 |
Pierre-Yves David |
packaging: mark as development versions
stable
|
changeset |
files
|
2019-06-07 |
Pierre-Yves David |
Added tag 9.0.0 for changeset 756db65030c6
stable
|
changeset |
files
|
2019-06-06 |
Pierre-Yves David |
packaging: prepare release 9.0.0
stable 9.0.0
|
changeset |
files
|
2019-06-06 |
Pierre-Yves David |
doc: clarify the status of configuration of the obshashrange protocol
stable
|
changeset |
files
|
2019-06-06 |
Pierre-Yves David |
changelog: add various missing bits
stable
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
templatekw: keep compatibility with Mercurial 4.5
stable
|
changeset |
files
|
2019-06-05 |
Pierre-Yves David |
test: adjust output to stable branch
stable
|
changeset |
files
|
2019-06-04 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-06-01 |
Joerg Sonnenberger |
templates: don't alias keywords directly
stable
|
changeset |
files
|
2019-05-28 |
Anton Shestakov |
stack: remove 'topic.' prefix from colors/labels
|
changeset |
files
|
2019-05-18 |
Anton Shestakov |
stack: handle hash sizes when --debug flag is provided
|
changeset |
files
|
2019-05-17 |
Anton Shestakov |
stack: always provide (full) node hash to non-default --template
|
changeset |
files
|
2019-05-17 |
Anton Shestakov |
stack: remove unnecessary prefix from stack output with non-default --template
|
changeset |
files
|
2019-05-17 |
Anton Shestakov |
stack: provide context to formatter with non-default --template
|
changeset |
files
|
2019-05-11 |
Anton Shestakov |
stack: leverage labelsgen() to produce all needed labels for fm.write()
|
changeset |
files
|
2019-05-08 |
Anton Shestakov |
stack: check if stack is empty more pythonically
|
changeset |
files
|
2019-05-08 |
Anton Shestakov |
stack: implement __bool__ and __nonzero__
|
changeset |
files
|
2019-05-05 |
Anton Shestakov |
stack: get stack data directly from stack and remove stackdata()
|
changeset |
files
|
2019-05-05 |
Anton Shestakov |
stack: use stack._revs instead of stack.revs[1:] in external children revset
|
changeset |
files
|
2019-06-04 |
Pierre-Yves David |
test: update output to match the parent changesets
|
changeset |
files
|
2019-05-27 |
Pierre-Yves David |
topic: add a simple option to reject publishing
|
changeset |
files
|
2019-06-04 |
Pierre-Yves David |
compat: adjust `wrapadd` for upstream
|
changeset |
files
|
2019-05-05 |
Faheem Mitha |
debian: override default value for SPHINXBUILD in docs/makefile
stable
|
changeset |
files
|
2019-05-27 |
Pierre-Yves David |
obshashtree: move obshashtree in its own module
|
changeset |
files
|
2019-05-26 |
Pierre-Yves David |
obsdiscovery: drop `obshash` discovery protocol (issue6136)
|
changeset |
files
|
2019-05-09 |
Martin von Zweigbergk |
cmdrewrite: use context manager for some locks and transactions
|
changeset |
files
|
2019-04-29 |
Sushil khanchi |
evolve: mention that --all is default, in list of options
|
changeset |
files
|
2019-05-13 |
Sushil khanchi |
touch: use util.acceptintervention() for closing the transaction
|
changeset |
files
|
2019-05-13 |
Sushil khanchi |
touch: use context manager for locks
|
changeset |
files
|
2019-05-13 |
Sushil khanchi |
touch: extract the logic of touching rev's to its own function
|
changeset |
files
|
2019-05-27 |
Pierre-Yves David |
changelog: mention user merging in the changelog
|
changeset |
files
|
2019-05-05 |
Sushil khanchi |
evolve: consider using three way merge to get the user for div resolution
|
changeset |
files
|
2019-05-05 |
Sushil khanchi |
evolve: add tests for the case when div csets has different users
|
changeset |
files
|
2019-05-02 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-04-25 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
changeset |
files
|
2019-05-02 |
Faheem Mitha |
debian: Override default value for SPHINXBUILD in docs/makefile
stable
|
changeset |
files
|
2019-05-02 |
Faheem Mitha |
docs: add SPHINXBUILD make variable
stable
|
changeset |
files
|
2019-04-27 |
Sushil khanchi |
topic: add test to increase code coverage in case of multiple topics
stable
|
changeset |
files
|
2019-04-27 |
Anton Shestakov |
changelog: --no-update is the default, recommend --update instead
|
changeset |
files
|
2019-04-26 |
Pulkit Goyal |
topic: drop support for accessing csets in branch stack using bxx (issue6119)
|
changeset |
files
|
2019-04-30 |
Matt Harbison |
legacy: drop the check for `obsolete._enabled`
stable
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: drop references to the old temporary commit that was created with amend
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
revset: add `predecessor` aliases for `precursors` and `allprecursors`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `bumped` references to `phase-divergent`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `divergent` references to `content-divergent`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `troubled` references to `unstable`
|
changeset |
files
|
2019-04-28 |
Matt Harbison |
docs: change `unstable` references to `orphan`
|
changeset |
files
|