Curtis L. Olson wrote: > It does do a pretty darn good job all things considered, but it's not > magic and it can't figure the 'right' thing to do given a conflicting > situation. And the number of times conflicting situations arise is > more than most patch apologists would probably admit. :-)
Of course it can't. It's a Hard problem, and requires peoples' brains to solve in the general case. This is no different for patch than it is for whole-file transfers. I'm not asking you to patch blindly, and if that's the way you've been doing it, I submit that perhaps you've misunderstood the tool. :) It sounds to me like your only complaint is that you can feed whole files straight to emerge, while taking a patch requires you to apply it first. The issue of saving the "pre-existing" files can be handled by the patch backup facility. Try this: % cd /your/cvs/area/FlightGear % patch -b -B origs/ -p0 < virtual-cockpit.patch (The -b says make backups, the -B says put them in "origs/", -p0 says preserve the local paths in the patch file) Now you have patched versions of panel.[hc]xx and main.cxx in your main tree, and the originals saved under ./origs. Merge away. Now, granted, this is more work than just saving files. But it's only trivially more work. I can't imagine this really being a limitation. If you decide the patch sucks, back it out: % (cd origs; tar cf - .) | tar xf - Really, give it a try. It's not so bad. If I've understood you correctly, the use of these two commands on a regular basis (script 'em for easier access) is all that's required to get you 1:1 commonality with your current work idiom. And it makes life for those of us who like to submit and apply patches considerably easier. :) Andy -- Andrew J. Ross NextBus Information Systems Senior Software Engineer Emeryville, CA [EMAIL PROTECTED] http://www.nextbus.com "Men go crazy in conflagrations. They only get better one by one." - Sting (misquoted) _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
