Fri, 18 Sep 2020 10:04:02 -0700 |
Martin von Zweigbergk |
rebase: fix an inconsistent hyphenation in a debug message
|
Fri, 31 Jul 2020 17:09:31 +0530 |
Pulkit Goyal |
merge stable in default
|
Tue, 28 Jul 2020 20:47:50 +0200 |
Manuel Jacob |
rebase: fix regression in file change detection introduced by 0ecb3b11fcad
stable
|
Thu, 23 Jul 2020 13:31:45 -0700 |
Kyle Lippincott |
morestatus: mention --stop even if not using --verbose
|
Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
Sat, 11 Jul 2020 03:10:23 +0200 |
Manuel Jacob |
rebase: correctly check for empty commit in in-memory mode
|
Fri, 10 Jul 2020 01:36:19 +0200 |
Manuel Jacob |
rebase: add test case that shows that inmemory rebase does not preserve merges
|
Fri, 13 Dec 2019 14:50:42 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
|
Wed, 06 Nov 2019 18:28:11 -0800 |
Kyle Lippincott |
rebase: check for unfinished ops even when inmemory (issue6214)
|
Wed, 21 Aug 2019 13:14:39 -0700 |
Martin von Zweigbergk |
merge: hint about using `hg resolve` for resolving conflicts
|
Tue, 02 Jul 2019 12:59:58 -0400 |
Valentin Gatien-Baron |
commit: improve the files field of changelog for merges
|
Mon, 24 Jun 2019 16:01:22 -0700 |
Martin von Zweigbergk |
rebase: fix in-memory rebasing of copy of empty file
|
Mon, 24 Jun 2019 16:07:59 -0700 |
Martin von Zweigbergk |
tests: demonstrate broken in-memory rebase of copy to empty file
|
Wed, 09 Jan 2019 15:54:45 -0800 |
Martin von Zweigbergk |
copies: fix duplicatecopies() with overlay context
|
Wed, 15 May 2019 16:10:52 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash when rebasing across copy with --collapse
|
Fri, 10 May 2019 11:03:54 -0700 |
Martin von Zweigbergk |
overlaycontext: allow calling copydata() on clean context
|
Fri, 10 May 2019 10:23:08 -0700 |
Martin von Zweigbergk |
tests: demonstrate another failure with in-memory rebase and copies
|
Wed, 24 Apr 2019 19:42:43 +0300 |
Pulkit Goyal |
context: check file exists before getting data from _wrappedctx
stable
|
Wed, 24 Apr 2019 19:28:46 +0300 |
Pulkit Goyal |
tests: show IMM is broken when merging file empty in destination
stable
|
Wed, 10 Apr 2019 16:26:40 -0700 |
Martin von Zweigbergk |
messages: replace some instances of "folder" by "directory"
|
Thu, 14 Mar 2019 14:46:29 -0700 |
Martin von Zweigbergk |
rebase: fix crash with in-memory rebase and copies
|
Thu, 14 Mar 2019 13:53:20 -0700 |
Martin von Zweigbergk |
test: demonstrate crash with in-memory rebase and copies
|
Thu, 21 Feb 2019 19:11:28 -0800 |
Kyle Lippincott |
tests: change the paths slightly in test-rebase-inmemory.t
|
Tue, 04 Dec 2018 08:50:33 -0800 |
Martin von Zweigbergk |
tests: drop redundant "#if execbit" from test-rebase-inmemory.t
|
Tue, 20 Nov 2018 14:43:27 -0800 |
Martin von Zweigbergk |
rebase: fix path auditing to audit path relative to repo root (issue5818)
stable 4.8.1
|
Tue, 04 Dec 2018 08:56:43 -0800 |
Martin von Zweigbergk |
tests: show bad path auditing in in-memory rebase
stable
|
Tue, 04 Dec 2018 08:55:48 -0800 |
Martin von Zweigbergk |
tests: add a missing "cd .." to test-rebase-inmemory.t
stable
|
Mon, 03 Dec 2018 11:14:44 -0800 |
Martin von Zweigbergk |
rebase: fix dir/file conflict detection when using in-mem merge
stable
|
Mon, 03 Dec 2018 11:11:34 -0800 |
Martin von Zweigbergk |
tests: show that in-mem rebase does not find path dir/file conflicts
stable
|
Mon, 03 Dec 2018 09:36:40 -0800 |
Martin von Zweigbergk |
rebase: abort in-mem rebase if there's a dirty merge state
stable
|