[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Cascading patchlogs with star-merge

From: Robert Collins
Subject: Re: [Gnu-arch-users] Cascading patchlogs with star-merge
Date: Mon, 22 Mar 2004 07:24:33 +1100

On Mon, 2004-03-22 at 03:16, Russell wrote:
> This can go on forever, and the only things getting added to the working
> copies each time are patch logs.  I was looking to automate the sharing
> of patches like this, but found that it never stopped.

This was the problem in my initial prototype of pure-merge. I fixed it
by examining the graph of patch-logs in the merge-source and the mergee,
and only merge a particular changeset if they have no intersection. 

Try this:
tla replay --skip-present <version-A>
from a project tree of <version-B>

This has a caveat : if you have patches that conflate merges & other
changes, this has the potential to lose those other changes - depending
on merge order. (Because it skips those changesets)

> "Don't do that!", I suppose.  Is this a communication thing, where it's
> up to each person to know that something has changed, and then only do
> merging when it's known to be necessary?  I had expected, from reading
> the tutorial, that arch would stop once all the source changes had made
> their way into each archive.
> How do people handle this in practice?

With star topologies, this tends not to happen, as the hub won't be
merging unless a request to merge has been made.

GPG key available at: <>.

Attachment: signature.asc
Description: This is a digitally signed message part

reply via email to

[Prev in Thread] Current Thread [Next in Thread]