| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
file |
diff |
annotate
|
| Mon, 16 Nov 2020 15:11:51 -0800 |
Martin von Zweigbergk |
errors: raise more specific errors from rewriteutil
|
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
|
| Tue, 02 Jul 2019 12:59:58 -0400 |
Valentin Gatien-Baron |
commit: improve the files field of changelog for merges
|
file |
diff |
annotate
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
file |
diff |
annotate
|
| Tue, 16 Apr 2019 02:53:28 +0530 |
Sushil khanchi |
commit: make the error message more specific while aborting branch closing
|
file |
diff |
annotate
|
| Thu, 30 May 2019 13:57:34 -0700 |
Kyle Lippincott |
commit: respect --no-edit in combination with --amend
|
file |
diff |
annotate
|
| Thu, 30 May 2019 14:14:52 -0700 |
Kyle Lippincott |
commit: add test showing that commit --amend --no-edit still shows editor
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 23:30:19 -0700 |
Martin von Zweigbergk |
tests: demonstrate that rename is followed to wrong parent from merge
|
file |
diff |
annotate
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
file |
diff |
annotate
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
file |
diff |
annotate
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
file |
diff |
annotate
|
| Sun, 15 Jul 2018 23:46:09 -0400 |
Matt Harbison |
hook: disable the shell to native command translation by default
|
file |
diff |
annotate
|
| Sat, 07 Jul 2018 23:38:06 -0400 |
Matt Harbison |
hook: add support for disabling the shell to native command translation
|
file |
diff |
annotate
|
| Tue, 03 Apr 2018 18:20:10 -0700 |
Gregory Szorc |
tests: remove superfluous config setting
|
file |
diff |
annotate
|
| Mon, 02 Apr 2018 16:47:53 -0700 |
Gregory Szorc |
debugcommands: drop offset and length from debugindex by default
|
file |
diff |
annotate
|
| Mon, 02 Apr 2018 16:28:20 -0700 |
Gregory Szorc |
debugcommands: drop base revision from debugindex
|
file |
diff |
annotate
|
| Sun, 11 Mar 2018 20:10:38 +0900 |
Yuya Nishihara |
amend: abort if unresolved merge conflicts found (issue5805)
stable
|
file |
diff |
annotate
|
| Sun, 14 Jan 2018 23:59:17 -0800 |
Martin von Zweigbergk |
evolution: report new unstable changesets
|
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
|
| Tue, 28 Nov 2017 05:50:45 +0530 |
Pulkit Goyal |
rewriteutil: use precheck() in uncommit and amend commands
|
file |
diff |
annotate
|
| Thu, 28 Sep 2017 18:56:40 +0100 |
Boris Feld |
config: use 'experimental.evolution.allowunstable'
|
file |
diff |
annotate
|
| Thu, 28 Sep 2017 18:19:06 +0100 |
Boris Feld |
config: use 'experimental.evolution.create-markers'
|
file |
diff |
annotate
|
| Fri, 01 Sep 2017 12:34:36 -0700 |
Saurabh Singh |
cmdutil: remove the redundant commit during amend
|
file |
diff |
annotate
|
| Fri, 01 Sep 2017 12:34:34 -0700 |
Saurabh Singh |
amend: add tests for amending only some files from commit to be amended
|
file |
diff |
annotate
|
| Thu, 03 Aug 2017 13:48:39 +0200 |
Boris Feld |
revset: rename unstable into orphan
|
file |
diff |
annotate
|
| Fri, 04 Aug 2017 18:41:16 +0200 |
Boris Feld |
test: update evolution config
|
file |
diff |
annotate
|
| Tue, 01 Aug 2017 17:53:48 +0200 |
Boris Feld |
evolution: rename unstable to orphan
|
file |
diff |
annotate
|
| Tue, 01 Aug 2017 17:39:28 +0200 |
Boris Feld |
evolution: rename trouble(s) to instability
|
file |
diff |
annotate
|
| Mon, 26 Jun 2017 15:28:28 -0700 |
Jun Wu |
amend: use scmutil.cleanupnodes (BC)
|
file |
diff |
annotate
|
| Mon, 02 Jan 2017 11:50:17 -0800 |
Gregory Szorc |
revlog: make compressed size comparisons consistent
|
file |
diff |
annotate
|
| Mon, 10 Oct 2016 12:06:58 +0200 |
Denis Laxalde |
cmdutil: add support for evolution "troubles" display in changeset_printer
|
file |
diff |
annotate
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Tue, 15 Nov 2016 21:56:49 +0100 |
Mads Kiilerich |
bdiff: give slight preference to appending lines
|
file |
diff |
annotate
|
| Tue, 08 Nov 2016 18:37:33 +0100 |
Mads Kiilerich |
bdiff: give slight preference to longest matches in the middle of the B side
|
file |
diff |
annotate
|
| Sun, 30 Oct 2016 06:15:09 +0900 |
FUJIWARA Katsunori |
tests: test preserving execbit changes at amending only on execbit platform
stable
|
file |
diff |
annotate
|
| Fri, 14 Oct 2016 01:31:11 +0200 |
Pierre-Yves David |
changegroup: skip delta when the underlying revlog do not use them
|
file |
diff |
annotate
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
file |
diff |
annotate
|
| Thu, 19 May 2016 14:35:22 -0700 |
Mateusz Kwapich |
localrepo: prevent executable-bit only changes from being lost on amend
stable
|
file |
diff |
annotate
|
| Wed, 23 Mar 2016 13:34:47 -0700 |
Martijn Pieters |
graphmod: set default edge styles for ascii graphs (BC)
|
file |
diff |
annotate
|
| Wed, 23 Dec 2015 12:41:20 -0800 |
Siddharth Agarwal |
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Mon, 01 Jun 2015 14:47:02 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 02 Jun 2015 02:28:33 +0900 |
FUJIWARA Katsunori |
templatekw: compare target context and its parent exactly (issue4690)
stable 3.4.1
|
file |
diff |
annotate
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
file |
diff |
annotate
|
| Fri, 22 May 2015 17:08:59 -0500 |
Matt Mackall |
branch: don't warn about branches if repository has multiple branches already
|
file |
diff |
annotate
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
file |
diff |
annotate
|
| Sun, 08 Mar 2015 00:04:03 -0500 |
Matt Harbison |
test-commit-amend: add globs for Windows
|
file |
diff |
annotate
|
| Mon, 02 Mar 2015 19:01:00 +0000 |
Pierre-Yves David |
amend: check for directory renames for both merge parents (issue4516)
stable
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
localrepo: show headline notes in commitctx before showing filenames
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 19:43:32 +0200 |
Mads Kiilerich |
bundle: when verbose, show what takes up the space in the generated bundle
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 15:09:43 +0900 |
FUJIWARA Katsunori |
memctx: calculate manifest correctly with newly-removed files (issue4470)
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 15:09:43 +0900 |
FUJIWARA Katsunori |
memctx: calculate manifest including newly added files correctly
|
file |
diff |
annotate
|
| Wed, 17 Dec 2014 15:09:38 +0900 |
FUJIWARA Katsunori |
memctx: calculate exact status being committed from specified files
|
file |
diff |
annotate
|