| Fri, 16 Jun 2017 01:46:47 +0530 |
Pulkit Goyal |
py3: replace dict.iterkeys() with iter(dict)
|
file |
diff |
annotate
|
| Sat, 03 Jun 2017 19:01:19 +0900 |
Yuya Nishihara |
merge: use scmutil.intrev() to sort ctx objects
|
file |
diff |
annotate
|
| Thu, 01 Jun 2017 02:14:26 +0530 |
Pulkit Goyal |
py3: convert bool variables to bytes before passing into ui.debug()
|
file |
diff |
annotate
|
| Wed, 31 May 2017 23:48:52 +0530 |
Pulkit Goyal |
py3: replace None with -1 to sort an integer array
|
file |
diff |
annotate
|
| Fri, 12 May 2017 16:33:33 -0700 |
Martin von Zweigbergk |
merge: use intersectmatchers() in "m2-vs-ma optimization"
|
file |
diff |
annotate
|
| Thu, 18 May 2017 17:11:24 -0400 |
Augie Fackler |
merge: migrate to context manager for changing dirstate parents
|
file |
diff |
annotate
|
| Thu, 11 May 2017 18:38:43 -0700 |
Phil Cohen |
merge: use repo.wvfs.setflags() instead of util.setflags()
|
file |
diff |
annotate
|
| Wed, 03 May 2017 10:43:59 -0700 |
Durham Goode |
rebase: use matcher to optimize manifestmerge
|
file |
diff |
annotate
|
| Sun, 26 Mar 2017 16:55:56 -0700 |
Jun Wu |
merge: use ProgrammingError
|
file |
diff |
annotate
|
| Sun, 19 Mar 2017 11:42:17 -0700 |
Durham Goode |
merge: remove unnecessary matcher checks
|
file |
diff |
annotate
|
| Mon, 13 Mar 2017 21:58:43 -0700 |
Martin von Zweigbergk |
merge: also allow 'e' action with experimental.updatecheck=noconflict
|
file |
diff |
annotate
|
| Sun, 12 Mar 2017 16:41:46 -0700 |
Mads Kiilerich |
merge: check current wc branch for 'nothing to merge', not its p1
|
file |
diff |
annotate
|
| Wed, 08 Mar 2017 16:53:32 -0800 |
Pierre-Yves David |
merge: directly use repo.vfs.join
|
file |
diff |
annotate
|
| Wed, 14 Jan 2015 01:15:26 +0100 |
Mads Kiilerich |
merge: use repo.wvfs.unlinkpath
|
file |
diff |
annotate
|
| Wed, 14 Jan 2015 01:15:26 +0100 |
Mads Kiilerich |
vfs: use repo.wvfs.unlinkpath
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 18:38:20 -0800 |
Durham Goode |
merge: remove uses of manifest.matches
|
file |
diff |
annotate
|
| Mon, 06 Mar 2017 23:21:27 -0800 |
Martin von Zweigbergk |
update: for "noconflict" updates, print "conflicting changes" on conflict
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 00:05:55 -0800 |
Martin von Zweigbergk |
update: allow setting default update check to "noconflict"
|
file |
diff |
annotate
|
| Mon, 13 Feb 2017 12:58:37 -0800 |
Martin von Zweigbergk |
update: accept --merge to allow merging across topo branches (issue5125)
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:09:19 -0800 |
Martin von Zweigbergk |
merge: combine the "merge" cases in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:07:01 -0800 |
Martin von Zweigbergk |
merge: combine "dirty" cases in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:29:34 -0800 |
Martin von Zweigbergk |
merge: clarify non-linear default updates in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:02:36 -0800 |
Martin von Zweigbergk |
merge: combine the two "can't happen" cases in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 15:00:13 -0800 |
Martin von Zweigbergk |
merge: move "incompatible options" case first in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 14:58:53 -0800 |
Martin von Zweigbergk |
merge: make "linear" an input in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 14:33:17 -0800 |
Martin von Zweigbergk |
merge: drop redundant column in docstring table
|
file |
diff |
annotate
|
| Mon, 27 Feb 2017 14:27:22 -0800 |
Martin von Zweigbergk |
merge: drop obsolete non-linear cases from docstring table
|
file |
diff |
annotate
|
| Thu, 09 Feb 2017 09:52:32 -0800 |
Martin von Zweigbergk |
destutil: remove duplicate check and leave it to merge.update()
|
file |
diff |
annotate
|
| Thu, 09 Feb 2017 09:55:31 -0800 |
Martin von Zweigbergk |
update: fix typo/stale comment to match code
|
file |
diff |
annotate
|
| Wed, 08 Feb 2017 23:03:33 -0800 |
Martin von Zweigbergk |
merge: remove unused handling of default destination in merge.update()
|
file |
diff |
annotate
|