[Gnu-arch-users] Re: in-tree pristines fatally wounded (merge-fest etc)

[Robert Collins]

On Tue, 2003-12-02 at 15:20, Miles Bader wrote:
> Robert Collins <address@hidden> writes:
> > > It has occured to me that perhaps we want a `link-sync' command or
> > > similar to make a tree as close as possible to a link tree from a
> > > given library revision.
> > 
> > Seems to me that here is where update and replay can differentiate:
> > update:
> >   undo
> >   hardlink-get new revision
> >   redo
> 
> BTW, note that sometimes you may ideally also want `reunification'
> following the redo step, if you're using tla update to merge from
> another branch [something I often do]; in that case their can be quite
> a few files that are considered `locally modified'.

Uhm, why? If you are merging against another branch, surely replay or
star-merge are better options?

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.

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