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-abort-phasediv.t
2019-03-26
Pierre-Yves David
evolve: drop the "computing new diff message" for phase-divergence
file
|
diff
|
annotate
2019-03-20
Martin von Zweigbergk
evolve: clarify output when phase-divergence resolution results in no change
file
|
diff
|
annotate
2019-01-22
Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
file
|
diff
|
annotate
2018-09-03
Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
file
|
diff
|
annotate
2018-09-03
Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
file
|
diff
|
annotate
2018-08-31
Pierre-Yves David
pick: replace `hg grab` invocation in test with `hg pick`
file
|
diff
|
annotate
2018-08-31
Pierre-Yves David
pick: update command output to mention pick instead of grab
file
|
diff
|
annotate
2018-08-21
Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
file
|
diff
|
annotate
2018-08-21
Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
file
|
diff
|
annotate
2018-08-18
Pulkit Goyal
evolve: set the second parent if we get conflicts while evolving
stable
file
|
diff
|
annotate
2018-08-18
Pulkit Goyal
tests: demonstrate the interrupted evolve does not set p2
stable
file
|
diff
|
annotate
2018-08-02
Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
file
|
diff
|
annotate
2018-08-02
Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
file
|
diff
|
annotate
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-05
Pulkit Goyal
evolve: show unfinished information in `hg status -v` (issue5886)
file
|
diff
|
annotate
2018-05-23
Pulkit Goyal
evolve: fix storage of replacements and temprevs node in evolvestate
file
|
diff
|
annotate
2018-05-23
Pulkit Goyal
tests: add more tests related to aborting while resolving phase-divergence
file
|
diff
|
annotate
2018-05-22
Pulkit Goyal
evolve: make `--abort` strip the temporary revs created during resolution
file
|
diff
|
annotate
2018-05-22
Pulkit Goyal
evolve: check for None before adding in set of revisions to strip
file
|
diff
|
annotate
2018-05-22
Pulkit Goyal
tests: add a test file `--abort` flag while resolving phase-divergence
file
|
diff
|
annotate
less
more
(0)
tip