Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-3000
-1000
-300
-100
-56
+56
+100
+300
+1000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
The revision graph only works with JavaScript-enabled browsers.
evolve: make one missed error to align other error messages
2018-06-15, by Pulkit Goyal
evolve: raise error.InterventionRequired instead of Abort when conflicts
2018-06-15, by Pulkit Goyal
changelog: add a changelog entry about divergence resolution
2018-06-14, by Pierre-Yves David
evolve: create resolved cset on successors of current parents
2018-06-14, by Pulkit Goyal
tests: fix a test case to not create conflicts
2018-06-14, by Pulkit Goyal
evolve: introduce a resolutionparent variable and store it in evolvestate
2018-06-14, by Pulkit Goyal
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
2018-06-13, by Pulkit Goyal
evolve: create a new commit instead of amending one of the divergents
2018-06-13, by Pulkit Goyal
evolve: always order the revs to be evolved
2018-06-12, by Pulkit Goyal
tests: add test of resolution of content-divergent stacks
2018-06-12, by Pulkit Goyal
evolve: improve error messages when conflicts occur
2018-06-12, by Pulkit Goyal
evolve: point to `hg help evolve.interrupted` while resolving content-div
2018-06-12, by Pulkit Goyal
tests: add test about aborting content-divergence when multiple parents
2018-06-12, by Pulkit Goyal
CHANGELOG: add an entry about the --update flag
2018-06-13, by Pulkit Goyal
evolve: show unfinished information in `hg status -v` (issue5886)
2018-06-06, by Pulkit Goyal
style: drop a (commented) debug print
2018-06-12, by Denis Laxalde
tests: update tests output with changes in d0abd7949ea3 in core hg
2018-06-10, by Pulkit Goyal
branching: merge with stable
2018-06-12, by Pierre-Yves David
Added tag 8.0.1 for changeset 0887c30255a1
stable
2018-06-11, by Pulkit Goyal
packaging: prepare for 8.0.1 release
stable
8.0.1
2018-06-11, by Pulkit Goyal
changelog: add a couple of missing entry
stable
2018-06-11, by Pierre-Yves David
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
2018-06-11, by Pulkit Goyal
evolve: store the obsmarkers to be deleted in evolvestate
2018-06-11, by Pulkit Goyal
evolve: store obsmarkers to be deleted in evolvestate
2018-06-11, by Pulkit Goyal
evolve: factor out logic to merge branches in separate function
2018-06-11, by Pulkit Goyal
tests: add more test of --stop while resolving content-divergence
2018-06-11, by Pulkit Goyal
evolve: strip the relocation commit on `hg evolve --stop`
2018-06-11, by Pulkit Goyal
evolve: declare updated and pctx variables in stopevolve()
2018-06-11, by Pulkit Goyal
evolve: store the old other divergent node after relocation in evolvestate
2018-06-10, by Pulkit Goyal
evolve: factor out logic for --stop flag in separate function
2018-06-10, by Pulkit Goyal
tests: add test for --stop flag when resolving multiparents content-div
2018-06-10, by Pulkit Goyal
evolve: move logic to continue interrupted content-div resolution to new fn
2018-06-10, by Pulkit Goyal
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
2018-06-11, by Pulkit Goyal
packaging: update tested-with statements in evolve and topic
stable
2018-06-09, by Pulkit Goyal
CHANGELOG: mention about 4.6.1 compatibility
stable
2018-06-09, by Pulkit Goyal
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
2018-06-08, by Pulkit Goyal
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
2018-06-08, by Pulkit Goyal
test-compat: merge stable into mercurial-4.5
mercurial-4.5
2018-06-08, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value
stable
2018-05-22, by Pulkit Goyal
CHANGELOG: add couple of entries about things fixed
stable
2018-06-08, by Pulkit Goyal
next-prev: always respect the --merge flag
stable
2018-06-08, by Pulkit Goyal
next-prev: add tests showing --merge not respected in some cases
stable
2018-06-08, by Pulkit Goyal
evolve: store the evolvestate if relocation results in conflicts
2018-06-07, by Pulkit Goyal
tests: add more test of resolution of content-divergent changesets
2018-06-07, by Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
2018-06-07, by Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
2018-06-07, by Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
2018-06-07, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
2018-06-07, by Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
2018-06-01, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
2018-06-01, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
2018-06-06, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
2018-06-06, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
2018-06-04, by Pulkit Goyal
evolve: move if-else block under the right block
2018-06-06, by Pulkit Goyal
tests: make sure we don't result in commit messages conflict
2018-06-05, by Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
2018-06-05, by Pulkit Goyal
less
more
|
(0)
-3000
-1000
-300
-100
-56
+56
+100
+300
+1000
tip