| Thu, 02 Mar 2023 14:44:43 +0100 |
Pierre-Yves David |
branch: pass current transaction when writing branch in merge
|
file |
diff |
annotate
|
| Wed, 25 Jan 2023 19:12:31 +0100 |
Pierre-Yves David |
dirstate: rename parentchange to changing_parents
|
file |
diff |
annotate
|
| Wed, 25 Jan 2023 18:46:20 +0100 |
Pierre-Yves David |
dirstate: pass the repo to the `changeparent` method
|
file |
diff |
annotate
|
| Thu, 12 Jan 2023 13:14:00 +0000 |
Arseniy Alekseyev |
merge: add mergeresult.mapaction to improve speed
|
file |
diff |
annotate
|
| Wed, 04 Jan 2023 19:30:47 +0000 |
Arseniy Alekseyev |
merge: avoid dereferencing repo fields repeatedly
|
file |
diff |
annotate
|
| Fri, 06 Jan 2023 18:09:19 +0000 |
Arseniy Alekseyev |
merge: skip syntactic path checks in [_checkunknownfile]
|
file |
diff |
annotate
|
| Wed, 04 Jan 2023 17:14:33 +0000 |
Arseniy Alekseyev |
merge: cache the fs checks made during [_checkunknownfiles]
|
file |
diff |
annotate
|
| Wed, 04 Jan 2023 19:13:41 +0000 |
Arseniy Alekseyev |
merge: don't pay for pathconflicts if there are none
|
file |
diff |
annotate
|
| Fri, 06 Jan 2023 16:01:31 +0000 |
Arseniy Alekseyev |
debug: add a config to abort update early
|
file |
diff |
annotate
|
| Thu, 16 Jun 2022 15:20:48 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
file |
diff |
annotate
|
| Tue, 14 Jun 2022 11:26:18 +0200 |
Pierre-Yves David |
purge: prevent a silly crash with --confirm --files
stable 6.1.4
|
file |
diff |
annotate
|
| Tue, 31 May 2022 22:50:01 +0200 |
Manuel Jacob |
py3: catch FileNotFoundError instead of checking errno == ENOENT
|
file |
diff |
annotate
|
| Mon, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
file |
diff |
annotate
|
| Mon, 21 Feb 2022 11:11:59 -0700 |
Gregory Szorc |
merge: remove pycompat.iteritems()
|
file |
diff |
annotate
|
| Thu, 03 Mar 2022 18:28:30 -0800 |
Gregory Szorc |
global: bulk replace simple pycompat.iteritems(x) with x.items()
|
file |
diff |
annotate
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
file |
diff |
annotate
|
| Mon, 28 Feb 2022 18:34:23 +0100 |
Raphaël Gomès |
merge: remove direct rustmod reference
stable 6.1
|
file |
diff |
annotate
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
file |
diff |
annotate
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
file |
diff |
annotate
|
| Thu, 03 Feb 2022 18:14:11 +0100 |
Pierre-Yves David |
narrow: allow merging non-conflicting change outside of the narrow spec
|
file |
diff |
annotate
|
| Sat, 29 Jan 2022 06:21:32 +0100 |
Pierre-Yves David |
merge-actions: have an attribute for narrow safetiness
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 15:19:58 +0100 |
Pierre-Yves David |
merge-actions: add an explicite "no_op" attribute
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 16:41:45 +0100 |
Pierre-Yves David |
merge: stop using merge action for pathconflict option
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:51 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:45 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:39 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:32 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:05 +0100 |
Pierre-Yves David |
merge: break up two not-so-one-liner for extra readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:24:41 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|