| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
file |
diff |
annotate
|
| Thu, 21 Jul 2016 15:55:47 -0700 |
Kostia Balytskyi |
update: fix bug when update tries to modify folder symlink
stable
|
file |
diff |
annotate
|
| Fri, 01 Jul 2016 17:42:55 +0200 |
Kostia Balytskyi |
update: teach hg to override untracked dir with a tracked file on update
|
file |
diff |
annotate
|
| Fri, 10 Jun 2016 00:12:33 -0400 |
Augie Fackler |
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
|
file |
diff |
annotate
|
| Thu, 26 May 2016 01:57:34 +0900 |
FUJIWARA Katsunori |
merge: make messages translatable
|
file |
diff |
annotate
|
| Mon, 16 May 2016 21:30:53 +0000 |
timeless |
py3: convert to next() function
|
file |
diff |
annotate
|
| Wed, 11 May 2016 09:31:47 +0200 |
Pierre-Yves David |
devel: officially deprecate update without destination
|
file |
diff |
annotate
|
| Sun, 08 May 2016 10:43:41 +0200 |
Pierre-Yves David |
devel: use the new 'config' argument for the update develwarn
|
file |
diff |
annotate
|
| 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
|
| Thu, 03 Dec 2015 23:01:59 -0500 |
Andrew Halberstadt |
merge.graft: add option to keep second parent
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
file |
diff |
annotate
|
| Tue, 24 Nov 2015 15:26:51 -0800 |
Siddharth Agarwal |
merge.recordupdates: mark 'a' files as added unconditionally
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:19:39 -0800 |
Siddharth Agarwal |
merge: add a new action type representing files to add/mark as modified
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:03:21 -0800 |
Siddharth Agarwal |
mergestate: add a cached property accessor for the local context
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 10:05:09 -0800 |
Siddharth Agarwal |
mergestate: raise exception if otherctx is accessed but _other isn't set
|
file |
diff |
annotate
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
file |
diff |
annotate
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
file |
diff |
annotate
|
| Sun, 22 Nov 2015 21:58:28 -0800 |
Siddharth Agarwal |
merge.applyupdates: create absentfilectxes for change/delete conflicts
|
file |
diff |
annotate
|
| Sun, 22 Nov 2015 21:59:52 -0800 |
Siddharth Agarwal |
mergestate: add methods to queue files to remove, add or get
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:55:01 -0800 |
Siddharth Agarwal |
mergestate: add a way to record pending dirstate actions
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 21:55:46 -0800 |
Siddharth Agarwal |
merge.recordupdates: don't require action keys to be present in dict
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 11:26:31 -0800 |
Siddharth Agarwal |
merge.applyupdates: extend action queues with ones returned from mergestate
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:43:25 -0800 |
Siddharth Agarwal |
mergestate: add a method to compute actions to perform on dirstate
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:37:39 -0800 |
Siddharth Agarwal |
merge.applyupdates: use counters from mergestate
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:18:51 -0800 |
Siddharth Agarwal |
mergestate: add a function to return the number of unresolved files
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:17:54 -0800 |
Siddharth Agarwal |
mergestate: add a method to return updated/merged/removed counts
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:32:47 -0800 |
Siddharth Agarwal |
mergestate._resolve: don't return the action any more
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 16:08:22 -0800 |
Siddharth Agarwal |
mergestate._resolve: store return code and action for each file
|
file |
diff |
annotate
|
| Sat, 14 Nov 2015 00:07:11 -0800 |
Siddharth Agarwal |
mergestate.add: store absentfilectxes as nullhex
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 01:14:15 -0800 |
Siddharth Agarwal |
mergestate._resolve: handle change/delete conflicts
|
file |
diff |
annotate
|
| Thu, 19 Nov 2015 10:50:02 -0800 |
Siddharth Agarwal |
merge.mergestate: compute dirstate action
|
file |
diff |
annotate
|