| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
file |
diff |
annotate
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
file |
diff |
annotate
|
| Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|
| Tue, 26 May 2020 11:14:07 -0400 |
Charles Chamberlain |
graft-state: save --base in graft's state, fixing bug with graft --continue
stable
|
file |
diff |
annotate
|
| Tue, 14 Apr 2020 19:09:56 -0400 |
Valentin Gatien-Baron |
graft: exit 1 on conflicts, like merge
|
file |
diff |
annotate
|
| Thu, 05 Mar 2020 08:37:08 -0800 |
Martin von Zweigbergk |
commit: print debug message when clearing dirstate and wdir clean
|
file |
diff |
annotate
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 15:14:19 -0800 |
Martin von Zweigbergk |
graftcopies: use _filter() for filtering out invalid copies
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 22:40:52 -0800 |
Martin von Zweigbergk |
tests: avoid grafting the same change over and over
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 15:53:16 -0800 |
Martin von Zweigbergk |
tests: split out another ~1/2 of test-graft.t
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 15:39:48 -0800 |
Martin von Zweigbergk |
tests: split out ~1/3 of test-graft.t
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 14:54:38 -0800 |
Martin von Zweigbergk |
commit: use cmdutil.check_at_most_one_arg()
|
file |
diff |
annotate
|
| Sun, 23 Jun 2019 22:31:31 +0530 |
Taapas Agrawal |
abort: added support for graft
|
file |
diff |
annotate
|
| Sun, 09 Jun 2019 02:12:58 +0530 |
Taapas Agrawal |
statecheck: added support for STATES
|
file |
diff |
annotate
|
| Tue, 14 May 2019 16:40:49 -0700 |
Martin von Zweigbergk |
commit: fix a typo ("form p1" -> "from p1")
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
file |
diff |
annotate
|
| Mon, 15 Apr 2019 14:09:18 -0700 |
Martin von Zweigbergk |
copies: delete debug message about "unmatched files new in both"
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 21:41:51 -0700 |
Martin von Zweigbergk |
copies: delete debug message about changes since common ancestor
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
file |
diff |
annotate
|
| Mon, 15 Apr 2019 16:41:43 -0700 |
Martin von Zweigbergk |
copies: fix up "fullcopy" with missing entries from "copy"
|
file |
diff |
annotate
|
| Sat, 13 Apr 2019 00:24:17 -0700 |
Martin von Zweigbergk |
tests: add test for issue5343 (grafting with copies)
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
file |
diff |
annotate
|
| Wed, 03 Apr 2019 09:38:08 -0700 |
Martin von Zweigbergk |
tests: better document the graft copy case
|
file |
diff |
annotate
|
| Thu, 10 Jan 2019 21:57:21 +0900 |
Yuya Nishihara |
graft: abort if --date/user specified with --currentdate/currentuser (BC)
|
file |
diff |
annotate
|
| Wed, 21 Nov 2018 21:40:16 +0900 |
Yuya Nishihara |
merge with stable
|
file |
diff |
annotate
|
| Sun, 14 Oct 2018 17:08:18 +0200 |
Mads Kiilerich |
graft: introduce --base option for using custom base revision while merging
|
file |
diff |
annotate
|
| Thu, 15 Nov 2018 22:59:38 +0900 |
Yuya Nishihara |
graft: do not try to skip rev derived from ancestor more than once (issue6024)
stable
|
file |
diff |
annotate
|
| Thu, 30 Aug 2018 01:53:21 +0200 |
Boris Feld |
phase: report number of non-public changeset alongside the new range
|
file |
diff |
annotate
|
| Sat, 18 Aug 2018 12:35:47 -0400 |
Matt Harbison |
test-graft: add a missing output line for Windows
|
file |
diff |
annotate
|
| Sat, 07 Jul 2018 22:40:39 +0900 |
Yuya Nishihara |
commit: try hard to reuse p1 manifest if nothing changed
|
file |
diff |
annotate
|
| Thu, 09 Aug 2018 13:13:09 +0300 |
Pulkit Goyal |
status: advertise --abort instead of 'update -C .' to abort graft
|
file |
diff |
annotate
|
| Tue, 26 Jun 2018 16:14:02 +0530 |
Sushil khanchi |
graft: add no-commit mode (issue5631)
|
file |
diff |
annotate
|
| Fri, 25 May 2018 18:16:38 +0530 |
Pulkit Goyal |
graft: introduce --abort flag to abort interrupted graft
|
file |
diff |
annotate
|
| Wed, 13 Jun 2018 22:50:32 +0530 |
Pulkit Goyal |
morestatus: remove some extra spaces
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 02:07:39 +0530 |
Pulkit Goyal |
cmdutil: say that `graft --stop` stops the graft instead of aborting
|
file |
diff |
annotate
|
| Mon, 28 May 2018 21:13:32 +0530 |
Pulkit Goyal |
graft: add a new `--stop` flag to stop interrupted graft
|
file |
diff |
annotate
|
| Sat, 26 May 2018 03:01:14 +0530 |
Pulkit Goyal |
graft: reuse the --log value passed initially in `hg graft --continue` (BC)
|
file |
diff |
annotate
|
| Sat, 26 May 2018 02:57:36 +0530 |
Pulkit Goyal |
graft: add test showing --continue not preserving --log passed earlier
|
file |
diff |
annotate
|
| Sat, 26 May 2018 02:11:09 +0530 |
Pulkit Goyal |
graft: drop --user and --date values info from hint in case of conflicts
|
file |
diff |
annotate
|
| Fri, 25 May 2018 17:21:01 +0530 |
Pulkit Goyal |
graft: reuse --user and --date values in `hg graft --continue` (BC)
|
file |
diff |
annotate
|
| Sat, 26 May 2018 01:52:42 +0530 |
Pulkit Goyal |
tests: add test showing --continue not preserving --date and --user flags
|
file |
diff |
annotate
|
| Wed, 28 Feb 2018 03:07:48 +0530 |
Pulkit Goyal |
graft: add test for reading old graftstate files with new mechanism
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
file |
diff |
annotate
|
| Thu, 03 Aug 2017 05:12:35 +0530 |
Pulkit Goyal |
morestatus: move fb extension to core by plugging to `hg status --verbose`
|
file |
diff |
annotate
|
| Tue, 02 May 2017 22:27:44 +0200 |
Pierre-Yves David |
caches: move the 'updating the branch cache' message in 'updatecaches'
|
file |
diff |
annotate
|
| Fri, 12 May 2017 11:20:25 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Wed, 03 May 2017 10:43:59 -0700 |
Durham Goode |
rebase: use matcher to optimize manifestmerge
|
file |
diff |
annotate
|
| Thu, 11 May 2017 17:18:40 +0200 |
Mads Kiilerich |
graft: fix graft across merges of duplicates of grafted changes
stable
|
file |
diff |
annotate
|
| Tue, 09 May 2017 00:11:30 +0200 |
Mads Kiilerich |
graft: test coverage of grafts and how merges can break duplicate detection
stable
|
file |
diff |
annotate
|
| Wed, 15 Mar 2017 23:21:30 +0900 |
Yuya Nishihara |
templatekw: make join() escape values of extras (BC) (issue5504)
|
file |
diff |
annotate
|
| Mon, 05 Dec 2016 17:40:01 +0100 |
Gábor Stefanik |
graft: support grafting changes to new file in renamed directory (issue5436)
|
file |
diff |
annotate
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Tue, 25 Oct 2016 21:01:53 +0200 |
Gábor Stefanik |
merge: avoid superfluous filemerges when grafting through renames (issue5407)
stable
|
file |
diff |
annotate
|
| Tue, 11 Oct 2016 04:39:47 +0200 |
Gábor Stefanik |
copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 11:54:03 +0200 |
Gábor Stefanik |
checkcopies: handle divergences contained entirely in tca::ctx
|
file |
diff |
annotate
|
| Thu, 13 Oct 2016 02:19:43 +0200 |
Gábor Stefanik |
mergecopies: invoke _computenonoverlap for both base and tca during merges
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 12:41:28 +0200 |
Gábor Stefanik |
tests: introduce tests for grafting through renames
|
file |
diff |
annotate
|
| Wed, 12 Oct 2016 21:33:45 +0200 |
Gábor Stefanik |
checkcopies: add a sanity check against false-positive copies
|
file |
diff |
annotate
|