> I admit to being slightly "patch" impaired and have had it blow up on
> me more times than I've had it work cleanly. In addition, I like to
> review the submitted changes before I apply them, and I like to do
> that with emacs-ediff mode. Because of the way I prefer to do things,
> it's easiest and most convenient for me to receive whole copies of any
> files that are changed, rather than just the patches. Other people do
> things differently and prefer just the patches. I'd recommend using
> "diff -c" if you plan to submit just the patches. That gives a bit of
> context around each patch so the patch utility can tell if the
> underlying file has changed and fail "gracefully" rather than blindly
> applying a diff in the (now) wrong place.
>
Ok. I did a bit of digging after asking the question and found a
"recommended" command:
cvs diff -c3p
This gives this style result:
Index: controls.hxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Controls/controls.hxx,v
retrieving revision 1.6
diff -c -3 -p -r1.6 controls.hxx
*** controls.hxx 24 Sep 2003 17:20:56 -0000 1.6
--- controls.hxx 11 Nov 2003 18:26:42 -0000
*************** public:
*** 86,91 ****
--- 86,96 ----
MAX_AUTOPILOTS = 3
};
+ enum {
+ ALL_ESEATS = -1,
+ MAX_ESEATS = 10
+ };
+
private:
// controls/flight/
double aileron;
Is this acceptable?
g.
_______________________________________________
Flightgear-devel mailing list
[EMAIL PROTECTED]
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
