2019-03-07 |
Anton Shestakov |
stack: optimize revset used for stack --children
|
changeset |
files
|
2019-03-07 |
Anton Shestakov |
stack: rename unstable -> orphan
|
changeset |
files
|
2019-03-06 |
Anton Shestakov |
evolvecmd: compatibility with older geteffectflag() that took a tuple
|
changeset |
files
|
2019-03-06 |
Anton Shestakov |
obshistory: remove unused geteffectflag(), it's been in core since 4.4
|
changeset |
files
|
2019-03-06 |
Anton Shestakov |
compat: remove old vocabulary change fallbacks
|
changeset |
files
|
2019-03-07 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-03-06 |
Sushil khanchi |
evolve: fix a typo from directory to dirty
stable
|
changeset |
files
|
2019-03-06 |
Sushil khanchi |
evolve: fix the dirstate after setting parents with dirty wdir (issue5930)
stable
|
changeset |
files
|
2019-03-06 |
Sushil khanchi |
evolve: add tests which shows evolve can get confused about copies (issue5930)
stable
|
changeset |
files
|
2019-03-05 |
Sushil khanchi |
test: include some documentation to describe the case briefly
stable
|
changeset |
files
|
2019-03-05 |
Sushil khanchi |
split: use ui.configoverride to preserve phase while commiting
stable
|
changeset |
files
|
2019-03-04 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-03-04 |
Pierre-Yves David |
changelog: add entries for the recent fixes
stable
|
changeset |
files
|
2019-03-03 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
changeset |
files
|
2019-03-03 |
Sushil khanchi |
evolve: add test which shows unrecoverable evolve state (issue6053)
stable
|
changeset |
files
|
2019-03-01 |
Sushil khanchi |
evolve: add a test in pubdiv where only merging leads to conflict
|
changeset |
files
|
2019-02-27 |
Sushil khanchi |
evolve: cover continue case in pubdiv when merging results in same as public
|
changeset |
files
|
2019-02-21 |
Sushil khanchi |
evolve: handle a case in pubic-div when merging results in same as public
|
changeset |
files
|
2019-02-27 |
Sushil khanchi |
evolve: rename npublicdiv to publicnode
|
changeset |
files
|
2019-02-27 |
Sushil khanchi |
evolve: in pubdiv resolution make sure that transaction get closed
|
changeset |
files
|
2019-02-25 |
Sushil khanchi |
evolve: pin the public cset to local side in merging when solving public div
|
changeset |
files
|
2019-02-22 |
Sushil khanchi |
evolve: add tests of relocation case in public divergence
|
changeset |
files
|
2019-03-03 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-03-01 |
Sushil khanchi |
split: make sure hg split preserve the phase of splitting cset (issue6048)
stable
|
changeset |
files
|
2019-03-01 |
Sushil khanchi |
split: add tests which demonstrate the issue6048
stable
|
changeset |
files
|
2019-02-22 |
Sushil khanchi |
evolve: fix the broken behaviour on div resolution in relocation case
|
changeset |
files
|
2019-02-22 |
Sushil khanchi |
evolve: change in a test which demonstrate divergence resolution can break
|
changeset |
files
|
2019-02-22 |
Sushil khanchi |
tests: update the title of a test as it's not what it says
|
changeset |
files
|
2019-02-13 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
|
changeset |
files
|
2019-02-13 |
Anton Shestakov |
evolve: remove unused StringIO import
|
changeset |
files
|
2019-02-13 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
|
changeset |
files
|
2019-02-13 |
Pierre-Yves David |
branching: overwrite broken merge with a correct one
|
changeset |
files
|
2019-02-13 |
Anton Shestakov |
branching: merge with stable
|
changeset |
files
|
2019-02-12 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-02-11 |
Anton Shestakov |
obshistory: omit keyword arguments with default values in patch.diffui() calls
stable
|
changeset |
files
|
2019-02-08 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-02-08 |
Pierre-Yves David |
test: wider another time matching in prev/next lock testing
stable
|
changeset |
files
|
2019-02-08 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-02-08 |
Pierre-Yves David |
test: wider time matching in prev/next lock testing
stable
|
changeset |
files
|
2018-11-21 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
|
changeset |
files
|
2019-01-30 |
Martin von Zweigbergk |
prompts: use 1-indexing in revselectionprompt()
|
changeset |
files
|
2019-02-07 |
Anton Shestakov |
test-split: split now ignores diff.* settings
|
changeset |
files
|
2019-02-03 |
Sangeet Kumar Mishra |
pick: add --tool for hg pick to specify mergetool
|
changeset |
files
|
2019-02-06 |
Anton Shestakov |
revset: use getintrange() to parse relation subscript
|
changeset |
files
|
2019-02-03 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2019-01-31 |
Sushil khanchi |
compat: pass contexts to _findlimit() (issue6066)
stable
|
changeset |
files
|
2019-02-03 |
Pierre-Yves David |
packaging: fix debian changelog
stable
|
changeset |
files
|
2019-01-30 |
Pierre-Yves David |
changelog: add relevant entries
|
changeset |
files
|
2019-01-22 |
Sushil khanchi |
evolve: add test for the case where public divergence on difference parents
|
changeset |
files
|
2019-01-21 |
Sushil khanchi |
evolve: update the public divergence resolution logic to cover --continue case
|
changeset |
files
|
2019-01-21 |
Sushil khanchi |
evolve: add logic to resolve content-divergence with a public cset
|
changeset |
files
|
2019-01-13 |
Sushil khanchi |
evolve: introduce function to create a obsmarker relation even for public cset
|
changeset |
files
|
2019-01-29 |
Anton Shestakov |
topic: make ranges work in revset relations like 'foo#stack[1:2]'
|
changeset |
files
|
2019-01-28 |
Anton Shestakov |
topic: simplify #stack index check/access
|
changeset |
files
|
2019-01-27 |
Anton Shestakov |
topic: make ranges work in revset relations like 'foo#topic[1:2]'
|
changeset |
files
|
2019-01-25 |
Sushil khanchi |
evolve: add description of function solveobswdp
|
changeset |
files
|
2019-01-23 |
Martin von Zweigbergk |
evolve: document the "if not shouldupdate" block
|
changeset |
files
|
2019-01-23 |
Martin von Zweigbergk |
evolve: make "startnode" consistently be a node, not a context
|
changeset |
files
|
2019-01-23 |
Martin von Zweigbergk |
evolve: use context managers for locks and transaction
|
changeset |
files
|
2019-01-22 |
Martin von Zweigbergk |
prune: use scmutil.cleanupnodes()
|
changeset |
files
|