Mercurial
Mercurial
>
hg
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-30000
-10000
-3000
-1000
-300
-100
-15
+15
+100
+300
+1000
+3000
+10000
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.
tests: add test for path conflicts during merge
2017-10-02, by Mark Thomas
tests: add test for path conflicts during update
2017-10-02, by Mark Thomas
context: also consider path conflicts when clearing unknown files
2017-10-02, by Mark Thomas
merge: check for path conflicts when merging (issue5628)
2017-10-02, by Mark Thomas
util: add safename function for generating safe names to rename to
2017-10-02, by Mark Thomas
merge: improve error messages for path conflicts during update
2017-10-02, by Mark Thomas
merge: check for path conflicts when updating (issue5628)
2017-10-02, by Mark Thomas
merge: rename conflicts to fileconflicts in _checkunknownfiles
2017-10-02, by Mark Thomas
merge: add _checkunknowndirs function for detecting path conflicts
2017-10-02, by Mark Thomas
merge: backup conflicting directories when getting files
2017-10-02, by Mark Thomas
merge: add merge action 'pr' to rename files during update
2017-10-02, by Mark Thomas
merge: add merge action 'p' to record path conflicts during update
2017-10-02, by Mark Thomas
commands: update the resolve command to handle path conflicts
2017-10-02, by Mark Thomas
merge: add pathconflict merge state
2017-10-02, by Mark Thomas
tests: add a test demonstrating basic path conflict failures
2017-10-02, by Mark Thomas
less
more
|
(0)
-30000
-10000
-3000
-1000
-300
-100
-15
+15
+100
+300
+1000
+3000
+10000
tip