| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Thu, 04 Mar 2021 08:20:19 -0800 |
Martin von Zweigbergk |
copies: filter out copies grafted from another branch
|
| Mon, 07 Dec 2020 20:32:05 -0500 |
Matt Harbison |
tests: correct the output order about starting a background thread for Windows
|
| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
| Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
| Tue, 26 May 2020 11:14:07 -0400 |
Charles Chamberlain |
graft-state: save --base in graft's state, fixing bug with graft --continue
stable
|
| Tue, 14 Apr 2020 19:09:56 -0400 |
Valentin Gatien-Baron |
graft: exit 1 on conflicts, like merge
|
| Thu, 05 Mar 2020 08:37:08 -0800 |
Martin von Zweigbergk |
commit: print debug message when clearing dirstate and wdir clean
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
| Fri, 27 Dec 2019 15:14:19 -0800 |
Martin von Zweigbergk |
graftcopies: use _filter() for filtering out invalid copies
|
| Fri, 27 Dec 2019 22:40:52 -0800 |
Martin von Zweigbergk |
tests: avoid grafting the same change over and over
|
| Fri, 27 Dec 2019 15:53:16 -0800 |
Martin von Zweigbergk |
tests: split out another ~1/2 of test-graft.t
|
| Fri, 27 Dec 2019 15:39:48 -0800 |
Martin von Zweigbergk |
tests: split out ~1/3 of test-graft.t
|
| Thu, 12 Dec 2019 14:54:38 -0800 |
Martin von Zweigbergk |
commit: use cmdutil.check_at_most_one_arg()
|
| Sun, 23 Jun 2019 22:31:31 +0530 |
Taapas Agrawal |
abort: added support for graft
|
| Sun, 09 Jun 2019 02:12:58 +0530 |
Taapas Agrawal |
statecheck: added support for STATES
|
| Tue, 14 May 2019 16:40:49 -0700 |
Martin von Zweigbergk |
commit: fix a typo ("form p1" -> "from p1")
|
| Thu, 11 Apr 2019 23:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
| Mon, 15 Apr 2019 14:09:18 -0700 |
Martin von Zweigbergk |
copies: delete debug message about "unmatched files new in both"
|
| Fri, 12 Apr 2019 21:41:51 -0700 |
Martin von Zweigbergk |
copies: delete debug message about changes since common ancestor
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
| Mon, 15 Apr 2019 16:41:43 -0700 |
Martin von Zweigbergk |
copies: fix up "fullcopy" with missing entries from "copy"
|
| Sat, 13 Apr 2019 00:24:17 -0700 |
Martin von Zweigbergk |
tests: add test for issue5343 (grafting with copies)
|
| Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
| Wed, 03 Apr 2019 09:38:08 -0700 |
Martin von Zweigbergk |
tests: better document the graft copy case
|
| Thu, 10 Jan 2019 21:57:21 +0900 |
Yuya Nishihara |
graft: abort if --date/user specified with --currentdate/currentuser (BC)
|
