[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge an
From: |
Robert Collins |
Subject: |
Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults |
Date: |
Sun, 09 Nov 2003 19:10:32 +1100 |
On Mon, 2003-11-10 at 17:49, Colin Walters wrote:
> On Sun, 2003-11-09 at 00:08, Robert Collins wrote:
> > > If you were using your own branch, you'd generally be using star-merge;
> > > if not, then you'd have to know to pass --exact to replay/update.
> >
> > Not true: replay --skip-present is a good merge tool. As is non exact
> > replay into a private branch (that is one where the local changes are
> > not being propogated upstream).
>
> Fine, so you'd pass --exact to replay.
Did you actually read my paragraph? You know, the one above? The one
that says that EXACT IS NOT PASSED TO REPLAY IN THESE EXAMPLES!?!?!?!?!
Rob
--
GPG key available at: <http://members.aardvark.net.au/lifeless/keys.txt>.
signature.asc
Description: This is a digitally signed message part
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, (continued)
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Robert Collins, 2003/11/08
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Colin Walters, 2003/11/08
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Robert Collins, 2003/11/08
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Colin Walters, 2003/11/08
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Tom Lord, 2003/11/08
- [Gnu-arch-users] Re: recent changes in address@hidden, and star-merge and update/replay defaults, Mike Hearn, 2003/11/09
- Re: [Gnu-arch-users] Re: recent changes in address@hidden, and star-merge and update/replay defaults, Robin Farine, 2003/11/09
- Re: [Gnu-arch-users] Re: recent changes in address@hidden, and star-merge and update/replay defaults, Miles Bader, 2003/11/09
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Robert Collins, 2003/11/09
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Colin Walters, 2003/11/09
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults,
Robert Collins <=
Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Dustin Sallings, 2003/11/08
Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Colin Walters, 2003/11/08