| Thu, 16 Jun 2022 15:20:48 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
| Tue, 14 Jun 2022 11:26:18 +0200 |
Pierre-Yves David |
purge: prevent a silly crash with --confirm --files
stable 6.1.4
|
| Tue, 31 May 2022 22:50:01 +0200 |
Manuel Jacob |
py3: catch FileNotFoundError instead of checking errno == ENOENT
|
| Mon, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
| Mon, 21 Feb 2022 11:11:59 -0700 |
Gregory Szorc |
merge: remove pycompat.iteritems()
|
| Thu, 03 Mar 2022 18:28:30 -0800 |
Gregory Szorc |
global: bulk replace simple pycompat.iteritems(x) with x.items()
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
| Mon, 28 Feb 2022 18:34:23 +0100 |
Raphaël Gomès |
merge: remove direct rustmod reference
stable 6.1
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
| Thu, 03 Feb 2022 18:14:11 +0100 |
Pierre-Yves David |
narrow: allow merging non-conflicting change outside of the narrow spec
|
| Sat, 29 Jan 2022 06:21:32 +0100 |
Pierre-Yves David |
merge-actions: have an attribute for narrow safetiness
|
| Fri, 28 Jan 2022 15:19:58 +0100 |
Pierre-Yves David |
merge-actions: add an explicite "no_op" attribute
|
| Fri, 28 Jan 2022 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
| Fri, 28 Jan 2022 16:41:45 +0100 |
Pierre-Yves David |
merge: stop using merge action for pathconflict option
|
| Fri, 28 Jan 2022 14:25:51 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:45 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:39 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:32 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:05 +0100 |
Pierre-Yves David |
merge: break up two not-so-one-liner for extra readability
|
| Fri, 28 Jan 2022 14:24:41 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:24:30 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:56 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:49 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:37 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
| Fri, 10 Dec 2021 17:20:21 +0100 |
Pierre-Yves David |
doc: remove a spurious ^L in some doc
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Fri, 26 Nov 2021 11:53:54 +0100 |
Raphaël Gomès |
typo: s/unkown/unknown across the codebase
|
| Wed, 17 Nov 2021 10:22:15 +0100 |
Pierre-Yves David |
update: filter the ambiguous mtime in update directly
|
