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
-50
-28
+28
+50
+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.
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
evolve: remove duplicated documentation
2018-06-06, by Pierre-Yves David
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
2018-06-06, by Pulkit Goyal
evolve: add a help topic `Interrupted-Evolve`
2018-05-23, by Pulkit Goyal
branching: merge with stable
2018-06-05, by Pierre-Yves David
changelog: fix version number error
stable
2018-06-05, by Pierre-Yves David
evolve: return the new node formed only as the replacement
2018-05-24, by Pulkit Goyal
tests: add more test of --abort flag for content-divergence resolution
2018-05-24, by Pulkit Goyal
evolve: prompt user for branch selection while resolving content-divergence
2018-06-04, by Pulkit Goyal
evolve: pass the base revision in _completecontentdivergent()
2018-06-05, by Pulkit Goyal
evolve: store the base of content-divergents in evolvestate
2018-06-05, by Pulkit Goyal
evolve: use cmdrewrite.amend() instead of creating a new commit
2018-06-05, by Pulkit Goyal
corecompat: update the tests output to show phase update summary
2018-06-03, by Pulkit Goyal
CHANGELOG: add an entry about issue 5808 being fixed
stable
2018-06-03, by Pulkit Goyal
next-prev: replace the error hint to mention about `--merge` flag
stable
2018-06-03, by Pulkit Goyal
tests: add tests for conflicts while respecting commands.update.check
stable
2018-06-03, by Pulkit Goyal
next: respect `commands.update.check` config option in `hg next` (issue5808)
stable
2018-06-03, by Pulkit Goyal
less
more
|
(0)
-3000
-1000
-300
-100
-50
-28
+28
+50
+100
+300
+1000
tip