Wed, 18 Sep 2019 17:53:10 +0700 |
Anton Shestakov |
merge: respect parents order when using `graft` on a merge, this time for real
stable
|
Mon, 09 Sep 2019 17:26:17 -0400 |
Augie Fackler |
merge with stable
|
Mon, 09 Sep 2019 17:32:21 +0200 |
Pierre-Yves David |
merge: respect parents order when using `graft` on a merge
stable
|
Wed, 21 Aug 2019 13:14:39 -0700 |
Martin von Zweigbergk |
merge: hint about using `hg resolve` for resolving conflicts
|
Thu, 27 Jun 2019 11:39:35 +0200 |
Valentin Gatien-Baron |
update: fix spurious unclean status bug shown by previous commit
|
Mon, 27 May 2019 16:55:46 -0400 |
Valentin Gatien-Baron |
merge: fix race that could cause wrong size in dirstate
|
Tue, 04 Jun 2019 17:24:35 +0800 |
Anton Shestakov |
merge: correct argument name in docstring
|
Sat, 09 Mar 2019 22:13:06 -0800 |
Martin von Zweigbergk |
merge: simplify initialization of "pas"
|
Sat, 09 Mar 2019 22:11:27 -0800 |
Martin von Zweigbergk |
merge: reorder some initialization to make more sense
|
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
|