| Sat, 19 Mar 2016 18:37:10 -0700 |
Simon Farnsworth |
merge: save merge part labels for later reuse
|
file |
diff |
annotate
|
| Fri, 26 Feb 2016 19:13:10 +0000 |
Simon Farnsworth |
merge: fix error message
|
file |
diff |
annotate
|
| Tue, 23 Feb 2016 10:59:25 -0800 |
Martin von Zweigbergk |
merge: use any() instead of for loop when checking for dirty subrepos
|
file |
diff |
annotate
|
| Sat, 20 Feb 2016 15:54:09 -0800 |
Gregory Szorc |
merge: perform background file closing in batchget
|
file |
diff |
annotate
|
| Sat, 20 Feb 2016 15:27:11 -0800 |
Gregory Szorc |
merge: indent code in batchget()
|
file |
diff |
annotate
|
| Thu, 11 Feb 2016 17:23:10 -0800 |
Durham Goode |
checkunknown: audit path before checking if it's a file or link
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 13:12:06 -0800 |
Siddharth Agarwal |
rebase: respect checkunknown and checkignored in more cases
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 20:28:32 -0800 |
Siddharth Agarwal |
merge: tell _checkunknownfiles about whether this was merge --force
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 20:28:32 -0800 |
Siddharth Agarwal |
merge: add missing doc for 'labels' parameter
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 20:28:32 -0800 |
Siddharth Agarwal |
merge: move abort/warn checks up to the top level of _checkunknownfiles
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:15:28 -0800 |
Durham Goode |
merge: add state extras merge state data
|
file |
diff |
annotate
|
| Fri, 29 Jan 2016 14:19:29 -0800 |
Siddharth Agarwal |
merge: don't try to merge subrepos twice (issue4988)
stable
|
file |
diff |
annotate
|
| Fri, 15 Jan 2016 13:14:49 -0800 |
Bryan O'Sullivan |
with: use context manager in merge update
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 18:38:49 -0800 |
Siddharth Agarwal |
merge: split up checks for unknown and ignored files that differ
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 18:17:07 -0800 |
Siddharth Agarwal |
merge: determine what untracked conflicts cause warns and aborts separately
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 18:12:35 -0800 |
Siddharth Agarwal |
merge: factor out code to get checkunknown config
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:11:52 -0800 |
Siddharth Agarwal |
merge: add options to warn or ignore on colliding unknown files
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:21:01 -0800 |
Siddharth Agarwal |
batchget: add support for backing up files
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
merge: add a new 'backup' argument to get actions
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
_checkunknownfiles: turn 'conflicts' into a set
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
checkunknownfiles: make control flow clearer
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 03:02:57 -0800 |
Siddharth Agarwal |
_checkunknownfiles: rename 'aborts' to 'conflicts'
|
file |
diff |
annotate
|
| Sat, 02 Jan 2016 02:13:56 +0100 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 28 Dec 2015 22:51:37 -0800 |
Siddharth Agarwal |
merge: while checking for unknown files don't follow symlinks (issue5027)
stable
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 20:57:21 -0500 |
Augie Fackler |
manifestmerge: have manifest do matching before diffing
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 20:47:22 -0500 |
Augie Fackler |
merge: rework manifestmerge to use a matcher
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 20:37:41 -0500 |
Augie Fackler |
merge: restate calculateupdates in terms of a matcher
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 18:54:03 -0500 |
Augie Fackler |
merge: have merge.update use a matcher instead of partial fn
|
file |
diff |
annotate
|
| Mon, 07 Dec 2015 20:43:24 -0800 |
Martin von Zweigbergk |
merge: refuse update/merge if there are unresolved conflicts (BC)
|
file |
diff |
annotate
|