Re: pika-0.1pre4 tarball broken
Robert Collins <[email protected]> Sun, 07 Dec 2003 17:24:05 +1100
| Newsgroups | gmane.lisp.scheme.pika.devel |
|---|---|
| Message-ID | <1070778245.1116.13.camel@localhost> |
On Sun, 2003-12-07 at 17:22, Tom Lord wrote: > > From: Matthew Dempsky <[email protected]> > > > Yeah, that's fine. Sorry, I used star-merge the first time I merged > > with you, but when I asked in #arch for their recommendations about > > branching and merging, I came under the impression that star-merge was > > intended for complicated purposes and replay --skip-present was for > > the general case > > I'll bet I can guess who you spoke with :-) Perhaps. I've been consistently describing it as 'just another tool in the toolkit'. > > so I tried that and it worked and even applied the > > patches a little bit faster so I just stuck with it. > > It's not even wrong -- it's just surprising. --skip-present should > ideally be viewed as an esoteric feature only for use by People Deeply > Immersed in How Arch Works and who additionally, Have a Difficult > Patch-Flow to Solve --- it shouldn't (ahem) be casually recommended on > #arch as a superior replacement to star-merge. ;). IMO star-merge and --skip-present are complementary - rest assured that I don't think either are presumptively superior..... although I do think that skip-present can handle cases star-merge can't (and thus, thats why it exists ;)). Rob -- GPG key available at: <http://www.robertcollins.net/keys.txt>. _______________________________________________ Pika-dev mailing list [email protected] http://mail.nongnu.org/mailman/listinfo/pika-dev
signature.asc
(application/pgp-signature, 189 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) iD8DBQA/0seDI5+kQ8LJcoIRAvmQAJ9+TFk7jytBXq/3+idr3aUy8xFqBQCgw3iG 7vSWGb206sNajCl0Sc7Pxtw= =pIYs -----END PGP SIGNATURE-----