| Sun, 14 Apr 2019 00:46:25 -0700 |
Martin von Zweigbergk |
merge: remove workaround for issue5020
|
| Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
| Wed, 03 Apr 2019 11:21:27 -0700 |
Martin von Zweigbergk |
cleanup: use set literals where possible
|
| Sat, 30 Mar 2019 13:13:10 -0700 |
Martin von Zweigbergk |
merge: make "labels" argument to graft() optional, like it is for update()
|
| Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
| Mon, 04 Feb 2019 21:19:05 -0800 |
Martin von Zweigbergk |
merge: migrate to scmutil.backuppath()
|
| Mon, 04 Feb 2019 21:23:44 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate absolute path
|
| Mon, 04 Feb 2019 21:21:55 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate backup path
|
| Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
| Tue, 08 Jan 2019 14:19:51 -0800 |
Daniel Ploch |
merge: make local file storage in the .hg/merge directory extensible
|
| Sun, 23 Dec 2018 13:16:25 +0530 |
Sushil khanchi |
merge: modify the logical statement
|
| Fri, 21 Dec 2018 09:48:30 -0800 |
Martin von Zweigbergk |
merge: extract helper for creating empty "actions" dict
|
| Fri, 21 Sep 2018 19:48:23 -0400 |
Matt Harbison |
py3: rename pycompat.getcwd() to encoding.getcwd() (API)
|
| Tue, 04 Sep 2018 15:55:23 -0700 |
Gregory Szorc |
merge: use vfs methods for I/O
|
| Thu, 06 Sep 2018 18:30:12 -0700 |
Gregory Szorc |
merge: move purge logic from extension
|
| Fri, 27 Jul 2018 14:56:10 +0300 |
Pulkit Goyal |
merge: do the trivial resolution after updating sparse checkout
stable
|
| Wed, 18 Jul 2018 09:49:34 -0700 |
Gregory Szorc |
merge: mark file gets as not thread safe (issue5933)
|
| Tue, 29 May 2018 00:26:20 +0200 |
Boris Feld |
merge: add a 'keepconflictparent' argument to graft
|
| Thu, 21 Jun 2018 09:32:31 -0700 |
Martin von Zweigbergk |
merge with stable
|
| Tue, 19 Jun 2018 22:45:52 +0900 |
Yuya Nishihara |
merge: do not fill manifest of committed revision with pseudo node (issue5526)
stable
|
| Sun, 17 Jun 2018 22:13:41 -0700 |
Martin von Zweigbergk |
progress: hide update(None) in a new complete() method
|
| Fri, 15 Jun 2018 22:37:01 -0700 |
Martin von Zweigbergk |
progress: create helper class for incrementing progress
|
| Thu, 17 May 2018 15:25:52 -0700 |
Martin von Zweigbergk |
narrow: filter set of files to check for case-folding to core
|
| Thu, 17 May 2018 15:12:48 -0700 |
Martin von Zweigbergk |
narrow: filter merge actions in core
|
| Fri, 11 May 2018 00:54:37 -0400 |
Augie Fackler |
merge: drop support for using updateresults as tuples (API)
|
| Sat, 14 Apr 2018 18:50:45 -0400 |
Matt Harbison |
scmutil: teach the file prefetch hook to handle multiple commits
|
| Thu, 29 Mar 2018 21:29:15 -0700 |
Martin von Zweigbergk |
context: avoid using a context object as a changeid
|
| Mon, 05 Mar 2018 00:30:00 -0500 |
Gregory Szorc |
merge: deprecate accessing update results by index
|
| Mon, 05 Mar 2018 18:10:36 -0800 |
Gregory Szorc |
merge: use constants for actions
|
| Mon, 05 Mar 2018 14:21:57 -0500 |
Gregory Szorc |
merge: use constants for merge record state
|
