| Wed, 13 Apr 2022 12:14:17 -0700 |
Kyle Lippincott |
rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes"
stable
|
file |
diff |
annotate
|
| Wed, 13 Apr 2022 13:15:33 -0700 |
Kyle Lippincott |
tests: add test demonstrating issue with ambiguous has prefixes during rebase
stable
|
file |
diff |
annotate
|
| Thu, 29 Jul 2021 16:23:45 -0400 |
Augie Fackler |
rewriteutil: fix crash when a rewritten message references f{6,64}
stable
|
file |
diff |
annotate
|
| Thu, 29 Jul 2021 16:18:35 -0400 |
Augie Fackler |
tests: add explicit coverage for update_hash_refs from rewriteutil
stable
|
file |
diff |
annotate
|
| Sat, 26 Dec 2020 18:26:32 +0530 |
Sushil khanchi |
rebase: handle the case when nothing to rebase (dry-run)
|
file |
diff |
annotate
|
| Sat, 26 Dec 2020 18:04:30 +0530 |
Sushil khanchi |
rebase: add test to demonstrate an issue in dry-run
|
file |
diff |
annotate
|
| Thu, 03 Dec 2020 14:15:39 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Wed, 02 Dec 2020 15:39:01 -0800 |
Martin von Zweigbergk |
rebase: clear merge state when aborting in-memory merge on dirty working copy
stable 5.6.1
|
file |
diff |
annotate
|
| Wed, 02 Dec 2020 15:15:16 -0800 |
Martin von Zweigbergk |
tests: show that in-memory rebase leaves state when working copy is dirty
stable
|
file |
diff |
annotate
|
| Wed, 02 Dec 2020 15:39:01 -0800 |
Martin von Zweigbergk |
rebase: clear merge state when aborting in-memory merge on dirty working copy
|
file |
diff |
annotate
|
| Wed, 02 Dec 2020 15:15:16 -0800 |
Martin von Zweigbergk |
tests: show that in-memory rebase leaves state when working copy is dirty
|
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
|
| Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
file |
diff |
annotate
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 15:03:06 -0700 |
Martin von Zweigbergk |
rebase: teach in-memory rebase to not restart with on-disk rebase on conflict
|
file |
diff |
annotate
|
| Fri, 18 Sep 2020 10:04:02 -0700 |
Martin von Zweigbergk |
rebase: fix an inconsistent hyphenation in a debug message
|
file |
diff |
annotate
|
| Fri, 31 Jul 2020 17:09:31 +0530 |
Pulkit Goyal |
merge stable in default
|
file |
diff |
annotate
|
| Tue, 28 Jul 2020 20:47:50 +0200 |
Manuel Jacob |
rebase: fix regression in file change detection introduced by 0ecb3b11fcad
stable
|
file |
diff |
annotate
|
| Thu, 23 Jul 2020 13:31:45 -0700 |
Kyle Lippincott |
morestatus: mention --stop even if not using --verbose
|
file |
diff |
annotate
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
file |
diff |
annotate
|
| Sat, 11 Jul 2020 03:10:23 +0200 |
Manuel Jacob |
rebase: correctly check for empty commit in in-memory mode
|
file |
diff |
annotate
|
| Fri, 10 Jul 2020 01:36:19 +0200 |
Manuel Jacob |
rebase: add test case that shows that inmemory rebase does not preserve merges
|
file |
diff |
annotate
|
| Fri, 13 Dec 2019 14:50:42 -0800 |
Martin von Zweigbergk |
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
|
file |
diff |
annotate
|
| Wed, 06 Nov 2019 18:28:11 -0800 |
Kyle Lippincott |
rebase: check for unfinished ops even when inmemory (issue6214)
|
file |
diff |
annotate
|
| Wed, 21 Aug 2019 13:14:39 -0700 |
Martin von Zweigbergk |
merge: hint about using `hg resolve` for resolving conflicts
|
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
|
| Mon, 24 Jun 2019 16:01:22 -0700 |
Martin von Zweigbergk |
rebase: fix in-memory rebasing of copy of empty file
|
file |
diff |
annotate
|
| Mon, 24 Jun 2019 16:07:59 -0700 |
Martin von Zweigbergk |
tests: demonstrate broken in-memory rebase of copy to empty file
|
file |
diff |
annotate
|
| Wed, 09 Jan 2019 15:54:45 -0800 |
Martin von Zweigbergk |
copies: fix duplicatecopies() with overlay context
|
file |
diff |
annotate
|
| Wed, 15 May 2019 16:10:52 -0700 |
Martin von Zweigbergk |
tests: demonstrate crash when rebasing across copy with --collapse
|
file |
diff |
annotate
|
| Fri, 10 May 2019 11:03:54 -0700 |
Martin von Zweigbergk |
overlaycontext: allow calling copydata() on clean context
|
file |
diff |
annotate
|
| Fri, 10 May 2019 10:23:08 -0700 |
Martin von Zweigbergk |
tests: demonstrate another failure with in-memory rebase and copies
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 19:42:43 +0300 |
Pulkit Goyal |
context: check file exists before getting data from _wrappedctx
stable
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 19:28:46 +0300 |
Pulkit Goyal |
tests: show IMM is broken when merging file empty in destination
stable
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 16:26:40 -0700 |
Martin von Zweigbergk |
messages: replace some instances of "folder" by "directory"
|
file |
diff |
annotate
|
| Thu, 14 Mar 2019 14:46:29 -0700 |
Martin von Zweigbergk |
rebase: fix crash with in-memory rebase and copies
|
file |
diff |
annotate
|
| Thu, 14 Mar 2019 13:53:20 -0700 |
Martin von Zweigbergk |
test: demonstrate crash with in-memory rebase and copies
|
file |
diff |
annotate
|
| Thu, 21 Feb 2019 19:11:28 -0800 |
Kyle Lippincott |
tests: change the paths slightly in test-rebase-inmemory.t
|
file |
diff |
annotate
|
| Tue, 04 Dec 2018 08:50:33 -0800 |
Martin von Zweigbergk |
tests: drop redundant "#if execbit" from test-rebase-inmemory.t
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Tue, 04 Dec 2018 08:56:43 -0800 |
Martin von Zweigbergk |
tests: show bad path auditing in in-memory rebase
stable
|
file |
diff |
annotate
|
| Tue, 04 Dec 2018 08:55:48 -0800 |
Martin von Zweigbergk |
tests: add a missing "cd .." to test-rebase-inmemory.t
stable
|
file |
diff |
annotate
|
| Mon, 03 Dec 2018 11:14:44 -0800 |
Martin von Zweigbergk |
rebase: fix dir/file conflict detection when using in-mem merge
stable
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Mon, 03 Dec 2018 09:36:40 -0800 |
Martin von Zweigbergk |
rebase: abort in-mem rebase if there's a dirty merge state
stable
|
file |
diff |
annotate
|
| Fri, 30 Nov 2018 16:21:37 -0800 |
Martin von Zweigbergk |
rebase: preserve working copy when redoing in-mem rebase on disk
stable
|
file |
diff |
annotate
|
| Fri, 30 Nov 2018 15:08:43 -0800 |
Martin von Zweigbergk |
tests: show that in-mem rebase falling back loses state
stable
|
file |
diff |
annotate
|
| Wed, 12 Sep 2018 17:45:43 +0300 |
Pulkit Goyal |
context: don't count deleted files as candidates for path conflicts in IMM
|
file |
diff |
annotate
|
| Wed, 12 Sep 2018 17:22:46 +0300 |
Pulkit Goyal |
rebase: add tests showing patch conflict detection needs to be smarter in IMM
|
file |
diff |
annotate
|
| Fri, 17 Aug 2018 10:21:25 +0900 |
Yuya Nishihara |
rebase: do not pass in user option to rollback in-memory merge conflict
|
file |
diff |
annotate
|
| Fri, 17 Aug 2018 10:19:17 +0900 |
Yuya Nishihara |
rebase: add test for in-memory merge conflicts
|
file |
diff |
annotate
|
| Thu, 16 Aug 2018 16:59:40 +0300 |
Pulkit Goyal |
context: make sure file is not deleted while checking path conflicts
|
file |
diff |
annotate
|
| Thu, 16 Aug 2018 16:53:48 +0300 |
Pulkit Goyal |
tests: demonstrate that IMM needs to be smarter with path conflicts
|
file |
diff |
annotate
|
| Thu, 16 Aug 2018 16:36:32 +0300 |
Pulkit Goyal |
tests: don't create new repo inside existing repo in test-rebase-inmemory.t
|
file |
diff |
annotate
|
| Wed, 15 Aug 2018 17:40:21 -0700 |
Kyle Lippincott |
overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)
|
file |
diff |
annotate
|
| Sat, 14 Jul 2018 08:59:42 +0530 |
Sushil khanchi |
rebase: in --confirm option just abort if hit a conflict
|
file |
diff |
annotate
|
| Thu, 12 Jul 2018 22:35:54 +0530 |
Sushil khanchi |
rebase: correct misleading message in --confirm option
|
file |
diff |
annotate
|
| Sat, 30 Jun 2018 12:42:49 +0530 |
Sushil khanchi |
rebase: add --confirm option
|
file |
diff |
annotate
|
| Fri, 29 Jun 2018 01:35:09 +0530 |
Sushil khanchi |
rebase: improve output of --dry-run
|
file |
diff |
annotate
|