Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ file revisions
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
file
| revisions |
annotate
|
diff
|
comparison
|
rss
|
help
(0)
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tests/test-evolve-orphan-merge.t
2018-06-14
Pulkit Goyal
evolve: raise error.InterventionRequired instead of Abort when conflicts
file
|
diff
|
annotate
2018-06-12
Pulkit Goyal
evolve: improve error messages when conflicts occur
file
|
diff
|
annotate
2018-06-10
Pulkit Goyal
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
file
|
diff
|
annotate
2018-06-05
Pulkit Goyal
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
file
|
diff
|
annotate
2018-04-23
Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
file
|
diff
|
annotate
2018-04-23
Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
file
|
diff
|
annotate
2018-04-22
Pierre-Yves David
evolve: point to '--abort' in error message
file
|
diff
|
annotate
2018-03-21
Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
file
|
diff
|
annotate
2018-03-21
Pierre-Yves David
test-compat: merge stable into mercurial-4.4
mercurial-4.4
file
|
diff
|
annotate
2018-03-18
Pulkit Goyal
evolve: handle stabilization of merge changeset with both parents obsoleted
file
|
diff
|
annotate
2018-03-19
Pulkit Goyal
evolve: preserve the order of merge parents in `hg evolve --continue`
file
|
diff
|
annotate
2018-03-19
Pulkit Goyal
tests: add more cases about stabilization of an orphaned merge commit
file
|
diff
|
annotate
2018-03-13
Pulkit Goyal
tests: add more tests related to stabilization of orphaned merge commit
file
|
diff
|
annotate
2018-03-13
Pulkit Goyal
evolve: fix stabilization of orphan merge changesets in case of conflicts
file
|
diff
|
annotate
2018-03-13
Pulkit Goyal
tests: add a test file of resolving orphaness of merge changesets
file
|
diff
|
annotate
less
more
(0)
tip