[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Sub-optimal ordering of rev-building in star-merge
From: |
Jan Hudec |
Subject: |
Re: [Gnu-arch-users] Sub-optimal ordering of rev-building in star-merge |
Date: |
Thu, 11 Mar 2004 17:18:34 +0100 |
User-agent: |
Mutt/1.5.5.1+cvs20040105i |
On Mon, Mar 08, 2004 at 22:42:06 -0500, Stefan Monnier wrote:
>
> I did a
>
> tla star-merge --three-way ...
>
> which was meant to apply the changes in a branch between patch 135 and 142.
> My revlib had rev 59 of that branch, so tla did:
>
> - Aha the latest is 142, so let's built that.
> - Aha the common ancestor is 135 so let's build that.
>
> Since the second came after the first, 142 was build from 59 by applying
> patches 60->142, while 135 was built from 59 as well by applying patch
> 60->135.
> Obviously, in this case the two steps should have been done in the
> opposite order. This was with tla-1.2
They obviously can't. Just think of it.
(I wanted to post the very same bugreport, until I realized it won't work).
Well, actualy it could be possible to do it, however pretty tricky.
Hint: logs only mention new logs.
The backpatching logic should mostly solve it.
-------------------------------------------------------------------------------
Jan 'Bulb' Hudec
<address@hidden>
signature.asc
Description: Digital signature