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-phase-divergence.t
2018-03-28
Pulkit Goyal
tests: add test about handling phase-divergent merges
file
|
diff
|
annotate
2018-03-28
Pulkit Goyal
tests: add more tests for solving phase-divergence using `hg evolve`
file
|
diff
|
annotate
2018-03-24
Pulkit Goyal
evolve: handle interrupted phase-divergence resolution gracefully
file
|
diff
|
annotate
2018-03-24
Pulkit Goyal
evolve: move logic to complete interrupted orphan resolution to new fn
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
evolve: write data to evolvestate in case on conflicts in phase-divergence
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
tests: add tests of content+parent change creating phase-divergence
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
tests: show first line of commit message in test-evolve-phase-divergence.t
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
evolve: make sure bookmarks are moved after phase-divergence resolution
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
evolve: use the new rebased changeset to resolve phase-divergence
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
tests: add one more test case about handling of phase-divergence by evolve
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
tests: add more tests for handling of phase divergence by `hg evolve`
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
tests: temporary delete the merge test of handling phase divergence
file
|
diff
|
annotate
2018-03-30
Pulkit Goyal
tests: various comment on test-evolve-phase-divergence
file
|
diff
|
annotate
2018-03-30
Pulkit Goyal
tests: make test-evolve-phase-divergence more descriptive
file
|
diff
|
annotate
2018-03-23
Pulkit Goyal
tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
file
|
diff
|
annotate
|
base
less
more
(0)
tip