2018-06-17 |
Pierre-Yves David |
rewind: automatically rewind entire stack
|
changeset |
files
|
2018-06-17 |
Pierre-Yves David |
rewind: add a test about rewinding top of stack
|
changeset |
files
|
2018-06-17 |
Pierre-Yves David |
rewind: use rewinded parent when creating multiple changesets
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: add a test for rewinding a fold
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: add a test for rewinding a split
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: update the working copy if it gets obsoleted
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: add a message about obsolete changeset
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: obsolete latest successors unless instructed otherwise
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: test rewinding an amended changesets
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: add a message about the rewinded changesets
|
changeset |
files
|
2018-06-16 |
Pierre-Yves David |
rewind: add a proto version of the command
|
changeset |
files
|
2018-06-29 |
Pierre-Yves David |
stablesort: make sure heads are processed in sorted order
|
changeset |
files
|
2018-06-19 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
changeset |
files
|
2018-06-19 |
Pulkit Goyal |
tests: add test to demonstrate issue5923
|
changeset |
files
|
2018-06-28 |
Pierre-Yves David |
changelog: add an entry about the new `evolve.interrupted` section
|
changeset |
files
|
2018-06-14 |
Pulkit Goyal |
evolve: make one missed error to align other error messages
|
changeset |
files
|
2018-06-14 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
changeset |
files
|
2018-06-14 |
Pierre-Yves David |
changelog: add a changelog entry about divergence resolution
|
changeset |
files
|
2018-06-13 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
changeset |
files
|
2018-06-13 |
Pulkit Goyal |
tests: fix a test case to not create conflicts
|
changeset |
files
|
2018-06-13 |
Pulkit Goyal |
evolve: introduce a resolutionparent variable and store it in evolvestate
|
changeset |
files
|
2018-06-13 |
Pulkit Goyal |
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
|
changeset |
files
|
2018-06-13 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
changeset |
files
|
2018-06-12 |
Pulkit Goyal |
evolve: always order the revs to be evolved
|
changeset |
files
|
2018-06-12 |
Pulkit Goyal |
tests: add test of resolution of content-divergent stacks
|
changeset |
files
|
2018-06-12 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
tests: add test about aborting content-divergence when multiple parents
|
changeset |
files
|
2018-06-13 |
Pulkit Goyal |
CHANGELOG: add an entry about the --update flag
|
changeset |
files
|
2018-06-05 |
Pulkit Goyal |
evolve: show unfinished information in `hg status -v` (issue5886)
|
changeset |
files
|
2018-06-12 |
Denis Laxalde |
style: drop a (commented) debug print
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
changeset |
files
|
2018-06-12 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
Added tag 8.0.1 for changeset 0887c30255a1
stable
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
packaging: prepare for 8.0.1 release
stable 8.0.1
|
changeset |
files
|
2018-06-11 |
Pierre-Yves David |
changelog: add a couple of missing entry
stable
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
evolve: store the obsmarkers to be deleted in evolvestate
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
evolve: store obsmarkers to be deleted in evolvestate
|
changeset |
files
|
2018-06-11 |
Pulkit Goyal |
evolve: factor out logic to merge branches in separate function
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
tests: add more test of --stop while resolving content-divergence
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
evolve: strip the relocation commit on `hg evolve --stop`
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
evolve: declare updated and pctx variables in stopevolve()
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
evolve: store the old other divergent node after relocation in evolvestate
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
evolve: factor out logic for --stop flag in separate function
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
tests: add test for --stop flag when resolving multiparents content-div
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
evolve: move logic to continue interrupted content-div resolution to new fn
|
changeset |
files
|
2018-06-10 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
packaging: update tested-with statements in evolve and topic
stable
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
CHANGELOG: mention about 4.6.1 compatibility
stable
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2018-05-22 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
stable
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
CHANGELOG: add couple of entries about things fixed
stable
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
next-prev: always respect the --merge flag
stable
|
changeset |
files
|
2018-06-08 |
Pulkit Goyal |
next-prev: add tests showing --merge not respected in some cases
stable
|
changeset |
files
|
2018-06-07 |
Pulkit Goyal |
evolve: store the evolvestate if relocation results in conflicts
|
changeset |
files
|
2018-06-07 |
Pulkit Goyal |
tests: add more test of resolution of content-divergent changesets
|
changeset |
files
|
2018-06-07 |
Pulkit Goyal |
evolvestate: store info about relocation while resolving content-divergence
|
changeset |
files
|