Hi Matthijs,
On Mon, Apr 03, 2017 at 07:33:49PM +0200, Matthijs Kooijman wrote:
> Hi Guido,
>
> > The rollback overall doesn't fail, only the part that tries to undo the
> > merge. Rollbacks are always best effort (roll back as much as you can)
> > and so master, etc. end up on the correct revs.
Hi Guido,
> The rollback overall doesn't fail, only the part that tries to undo the
> merge. Rollbacks are always best effort (roll back as much as you can)
> and so master, etc. end up on the correct revs. However we must not
> fail the merge rollback.
Yeah, exactly.
> > Looking more closely
Hi Matthijs,
On Mon, Apr 03, 2017 at 04:06:55PM +0200, Matthijs Kooijman wrote:
> Package: git-buildpackage
> Version: 0.8.12.2
> Severity: normal
>
> I just ran gbp import-orig to update a package, and somehow the merge
> fails. The subsequent rollback also reports an error, but looking at the
>
Package: git-buildpackage
Version: 0.8.12.2
Severity: normal
I just ran gbp import-orig to update a package, and somehow the merge
fails. The subsequent rollback also reports an error, but looking at the
repository state the master, upstream and pristine-tar branches are
unmodified (probably
4 matches
Mail list logo
