Re: [Gnu-arch-users] Weird results of star-merge

[Aaron Bentley]

Juliusz Chroboczek wrote:
> polipo--stable--0.9 was originally a tag of polipo--devel--0--patch-31
> that has since lived its own way.  I regularly merge the fixes in
> stable--0.9 into devel--0.
>
> Now recently I fixed a bug in polipo--devel--0, committed it as
> polipo--devel--0--patch-81, and merged it as polipo--stable--0.9--patch-13.
> Now when I do
>
>   cd polipo-stable
>   tla star-merge polipo--stable--0.9
>   tla changes --diffs
>
> I see polipo--devel--0--patch-32 through 80 being marked as deleted.
> Doing tla logs confirms that.
>
> Is that the expected behaviour, or have I done something wrong?

That's expected.  Star-merge can't distinguish between a replay an a 
merge.  It thinks you merged all changes between patch-31 and patch-81, 
decided most of them were junk, and undid them.

It's applying your latest changes, it's just got a defective view of 
what your latest changes are.

> How
> am I supposed to merge polipo--stable--0.9--patch-14 and later into
> polipo--devel?  Replay?

You can get a patchlog for stable--patch-13.  That will make it look 
like devel is the more up-to-date branch, so you can star-merge after 
that.  To get the patchlog, do "tla sync-tree 
polipo--stable--0.9--patch-13".

Alternatively, you can forget about patch-13, and just replay patch-14. 
 Star-merge should work after that.

Aaron
--
Aaron Bentley
Director of Technology
Panometrics, Inc.