Mercurial
Mercurial
>
hg-stable
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
help
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
+10000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Sat, 02 Jan 2016 03:02:57 -0800
merge: add a new 'backup' argument to get actions
changeset
Siddharth Agarwal <sid0@fb.com> [Sat, 02 Jan 2016 03:02:57 -0800] rev 27655
merge: add a new 'backup' argument to get actions We're going to use this in an upcoming patch to back untracked files up when they're replaced by tracked ones.
Sat, 02 Jan 2016 03:02:57 -0800
_checkunknownfiles: turn 'conflicts' into a set
changeset
Siddharth Agarwal <sid0@fb.com> [Sat, 02 Jan 2016 03:02:57 -0800] rev 27654
_checkunknownfiles: turn 'conflicts' into a set We'll check for membership in this set in an upcoming patch.
Sat, 02 Jan 2016 03:02:57 -0800
checkunknownfiles: make control flow clearer
changeset
Siddharth Agarwal <sid0@fb.com> [Sat, 02 Jan 2016 03:02:57 -0800] rev 27653
checkunknownfiles: make control flow clearer In particular, make it clear that we only check for and abort on conflicts if force is not true.
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
+10000
tip