| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
| Mon, 16 Nov 2020 15:11:51 -0800 |
Martin von Zweigbergk |
errors: raise more specific errors from rewriteutil
|
| Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
| Tue, 02 Jul 2019 12:59:58 -0400 |
Valentin Gatien-Baron |
commit: improve the files field of changelog for merges
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
| Tue, 16 Apr 2019 02:53:28 +0530 |
Sushil khanchi |
commit: make the error message more specific while aborting branch closing
|
| Thu, 30 May 2019 13:57:34 -0700 |
Kyle Lippincott |
commit: respect --no-edit in combination with --amend
|
| Thu, 30 May 2019 14:14:52 -0700 |
Kyle Lippincott |
commit: add test showing that commit --amend --no-edit still shows editor
|
| Thu, 11 Apr 2019 23:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
| Sat, 27 Apr 2019 23:30:19 -0700 |
Martin von Zweigbergk |
tests: demonstrate that rename is followed to wrong parent from merge
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
| Sun, 15 Jul 2018 23:46:09 -0400 |
Matt Harbison |
hook: disable the shell to native command translation by default
|
| Sat, 07 Jul 2018 23:38:06 -0400 |
Matt Harbison |
hook: add support for disabling the shell to native command translation
|
| Tue, 03 Apr 2018 18:20:10 -0700 |
Gregory Szorc |
tests: remove superfluous config setting
|
| Mon, 02 Apr 2018 16:47:53 -0700 |
Gregory Szorc |
debugcommands: drop offset and length from debugindex by default
|
| Mon, 02 Apr 2018 16:28:20 -0700 |
Gregory Szorc |
debugcommands: drop base revision from debugindex
|
| Sun, 11 Mar 2018 20:10:38 +0900 |
Yuya Nishihara |
amend: abort if unresolved merge conflicts found (issue5805)
stable
|
| Sun, 14 Jan 2018 23:59:17 -0800 |
Martin von Zweigbergk |
evolution: report new unstable changesets
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Tue, 28 Nov 2017 05:50:45 +0530 |
Pulkit Goyal |
rewriteutil: use precheck() in uncommit and amend commands
|
| Thu, 28 Sep 2017 18:56:40 +0100 |
Boris Feld |
config: use 'experimental.evolution.allowunstable'
|
| Thu, 28 Sep 2017 18:19:06 +0100 |
Boris Feld |
config: use 'experimental.evolution.create-markers'
|
| Fri, 01 Sep 2017 12:34:36 -0700 |
Saurabh Singh |
cmdutil: remove the redundant commit during amend
|
| Fri, 01 Sep 2017 12:34:34 -0700 |
Saurabh Singh |
amend: add tests for amending only some files from commit to be amended
|
| Thu, 03 Aug 2017 13:48:39 +0200 |
Boris Feld |
revset: rename unstable into orphan
|
| Fri, 04 Aug 2017 18:41:16 +0200 |
Boris Feld |
test: update evolution config
|
| Tue, 01 Aug 2017 17:53:48 +0200 |
Boris Feld |
evolution: rename unstable to orphan
|
| Tue, 01 Aug 2017 17:39:28 +0200 |
Boris Feld |
evolution: rename trouble(s) to instability
|
| Mon, 26 Jun 2017 15:28:28 -0700 |
Jun Wu |
amend: use scmutil.cleanupnodes (BC)
|
| Mon, 02 Jan 2017 11:50:17 -0800 |
Gregory Szorc |
revlog: make compressed size comparisons consistent
|
| Mon, 10 Oct 2016 12:06:58 +0200 |
Denis Laxalde |
cmdutil: add support for evolution "troubles" display in changeset_printer
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
| Tue, 15 Nov 2016 21:56:49 +0100 |
Mads Kiilerich |
bdiff: give slight preference to appending lines
|
| Tue, 08 Nov 2016 18:37:33 +0100 |
Mads Kiilerich |
bdiff: give slight preference to longest matches in the middle of the B side
|
| Sun, 30 Oct 2016 06:15:09 +0900 |
FUJIWARA Katsunori |
tests: test preserving execbit changes at amending only on execbit platform
stable
|
| Fri, 14 Oct 2016 01:31:11 +0200 |
Pierre-Yves David |
changegroup: skip delta when the underlying revlog do not use them
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
| Thu, 19 May 2016 14:35:22 -0700 |
Mateusz Kwapich |
localrepo: prevent executable-bit only changes from being lost on amend
stable
|
| Wed, 23 Mar 2016 13:34:47 -0700 |
Martijn Pieters |
graphmod: set default edge styles for ascii graphs (BC)
|
| Wed, 23 Dec 2015 12:41:20 -0800 |
Siddharth Agarwal |
tests: explicitly request changed version in c/d conflict in test-commit-amend.t
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
| Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Mon, 01 Jun 2015 14:47:02 -0500 |
Matt Mackall |
merge with stable
|
| Tue, 02 Jun 2015 02:28:33 +0900 |
FUJIWARA Katsunori |
templatekw: compare target context and its parent exactly (issue4690)
stable 3.4.1
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
| Fri, 22 May 2015 17:08:59 -0500 |
Matt Mackall |
branch: don't warn about branches if repository has multiple branches already
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
| Sun, 08 Mar 2015 00:04:03 -0500 |
Matt Harbison |
test-commit-amend: add globs for Windows
|
| Mon, 02 Mar 2015 19:01:00 +0000 |
Pierre-Yves David |
amend: check for directory renames for both merge parents (issue4516)
stable
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
| Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
localrepo: show headline notes in commitctx before showing filenames
|
| Fri, 15 Aug 2014 19:43:32 +0200 |
Mads Kiilerich |
bundle: when verbose, show what takes up the space in the generated bundle
|
| Wed, 17 Dec 2014 15:09:43 +0900 |
FUJIWARA Katsunori |
memctx: calculate manifest correctly with newly-removed files (issue4470)
|
| Wed, 17 Dec 2014 15:09:43 +0900 |
FUJIWARA Katsunori |
memctx: calculate manifest including newly added files correctly
|
| Wed, 17 Dec 2014 15:09:38 +0900 |
FUJIWARA Katsunori |
memctx: calculate exact status being committed from specified files
|
| Tue, 09 Dec 2014 03:38:23 +0100 |
Mads Kiilerich |
graft: show more useful status information while grafting
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
| Thu, 16 Oct 2014 06:35:06 -0700 |
Ryan McElroy |
amend: fix amending rename commit with diverged topologies (issue4405)
stable
|
| Tue, 14 Oct 2014 13:34:57 -0700 |
Durham Goode |
obsolete: update test-commit-amend to use obsolete option
|
| Sat, 16 Aug 2014 10:43:59 +0900 |
FUJIWARA Katsunori |
commit: change "editform" to distinguish merge commits from other (--amend)
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
| Wed, 16 Apr 2014 02:38:11 +0900 |
FUJIWARA Katsunori |
amend: invoke editor forcibly when "--edit" option is specified
|
| Wed, 19 Mar 2014 01:07:41 +0900 |
FUJIWARA Katsunori |
amend: save commit message into ".hg/last-message.txt"
stable
|
| Thu, 13 Mar 2014 19:48:41 +0900 |
FUJIWARA Katsunori |
commit: create new amend changeset as secret correctly for "--secret" option
stable
|
| Tue, 05 Nov 2013 10:55:45 +0100 |
Pierre-Yves David |
test: do not add .pyc and .orig in test-commit-amend.t (issue4085)
stable
|
| Thu, 02 May 2013 19:36:47 +0300 |
Iulian Stana |
commit: amending with --close-branch (issue3445)
stable
|
| Fri, 12 Apr 2013 17:00:42 -0400 |
Augie Fackler |
test-commit-amend.t: fix check-code violation from 3a72c89a83ec
|
| Fri, 08 Feb 2013 21:08:34 +0000 |
Brodie Rao |
amend: support amending merge changesets (issue3778)
|
| Tue, 15 Jan 2013 22:08:47 -0600 |
Kevin Bullock |
tests: more comment cleanup related to obsolescence
|
| Wed, 16 Jan 2013 00:46:29 +0100 |
Pierre-Yves David |
test: fix in-test comments related to obsolescence
|
| Tue, 08 Jan 2013 20:37:37 +0100 |
Pierre-Yves David |
clfilter: enforce hidden changeset globally
|
| Wed, 02 Jan 2013 00:24:28 -0600 |
Matt Mackall |
merge with stable
|
| Sun, 30 Dec 2012 03:49:15 +0100 |
Pierre-Yves David |
amend: prevent loss of bookmark on failed amend
stable
|
| Sat, 29 Dec 2012 18:00:18 +0100 |
Pierre-Yves David |
amend: invalidate dirstate in case of failure (issue3670)
stable
|
| Mon, 31 Dec 2012 17:44:18 -0600 |
Pierre-Yves David |
amend: allow amend of non-head when obsolete is enabled
|
| Tue, 13 Nov 2012 08:41:56 -0800 |
Pierre-Yves David |
amend: force editor only if old message is reused (issue3698)
stable
|
| Wed, 24 Oct 2012 15:37:32 +0200 |
Pierre-Yves David |
amend: fix incompatibity between logfile and message option (issue3675)
stable
|
| Thu, 18 Oct 2012 22:12:15 +0200 |
Pierre-Yves David |
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
|
| Tue, 11 Sep 2012 00:12:07 +0200 |
Pierre-Yves David |
amend: add obsolete support
|
| Sat, 25 Aug 2012 16:20:41 +0200 |
Pierre-Yves David |
amend: use an explicit commit message for temporary amending commit
|
| Mon, 03 Sep 2012 17:25:50 +0100 |
Jim Hague |
tests: correct quoting of double quotes in here documents used to write hooks
stable
|
| Thu, 30 Aug 2012 16:47:08 +0200 |
Pierre-Yves David |
amend: preserve phase of amended revision (issue3602)
stable
|
| Fri, 29 Jun 2012 15:21:35 +0200 |
Adrian Buehlmann |
test-commit-amend: adapt for Windows after fba17a64fa49
|
| Fri, 29 Jun 2012 00:40:52 -0500 |
Matt Mackall |
merge with stable
|
| Sat, 23 Jun 2012 19:57:29 +0300 |
Idan Kamara |
amend: disable hooks when creating intermediate commit (issue3501)
stable
|
| Sun, 10 Jun 2012 14:41:14 +0200 |
Mads Kiilerich |
tests: consistently use a HGEDITOR pattern that works with msys on windows
|
| Sun, 10 Jun 2012 14:14:52 +0200 |
Mads Kiilerich |
tests: glob the remaining 'saved backup bundle to' to prepare for windows
|
| Thu, 17 May 2012 15:34:59 -0500 |
Matt Mackall |
branchcache: backout 0311a6abd38a
|
| Fri, 11 May 2012 10:35:54 -0700 |
Joshua Redstone |
localrepo: strip now incrementally updates the branchheads cache
|
| Fri, 11 May 2012 18:33:45 +0300 |
Idan Kamara |
amend: preserve extra dict (issue3430)
stable
|
| Mon, 30 Apr 2012 20:45:45 +0200 |
Patrick Mezard |
amend: fix copy records handling (issue3410)
stable
|
| Mon, 30 Apr 2012 20:36:29 +0200 |
Patrick Mezard |
test-commit-amend: exhibit an --amend weirdness
stable
|
| Sat, 28 Apr 2012 01:22:56 +0200 |
Mads Kiilerich |
tests: skip new tests with requirements not available on windows
stable
|
| Mon, 23 Apr 2012 01:39:26 +0200 |
Mads Kiilerich |
tests: ^ must be quoted when used on solaris sh
stable
|
| Wed, 18 Apr 2012 01:20:16 +0300 |
Idan Kamara |
commit: add option to amend the working dir parent
|
