[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 16:35:43 +1100 |
On Mon, 2003-11-10 at 16:13, Colin Walters wrote:
> > When there are tags more recent than base-0.
>
> Why would you do this? Wouldn't you lose all the changes from previous
> revisions?
Yes, and thats the point. If you hack on feature X, it gets accepted
upstream, and you want to reset your branch, you have three choices:
1) star-merge in a patch of size X.
2) sync-tree it, getting a patch of size X.
3) retag it from the upstream, getting a patch of a few K.
3 can lead to considerable savings over the long term. And it's the same
as 2) from a loss of local changes perspective. And you don't want local
changes because they've just been merged.
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, 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
- 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
- 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/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, Colin Walters, 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, Tom Lord, 2003/11/09
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Colin Walters, 2003/11/09
- [Gnu-arch-users] Monolithic vs layered programs, Robert Collins, 2003/11/09
- Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Charles Duffy, 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, 2003/11/09
Re: [Gnu-arch-users] recent changes in address@hidden, and star-merge and update/replay defaults, Colin Walters, 2003/11/09