Re: [gnome-love] CVS, diff, organize my dev, etc.

[Malcolm Tredinnick <malcolm commsecure com au>]

On Sat, Jun 02, 2001 at 12:50:36AM +0200, Thomas Broyer wrote:
> Le 01/06/01 23:44:14, Kevin Vandersloot a écrit :
> > You can just do a diff for individual files or directories. So if you
> > just changed gtk.h you could use 'cvs diff -u gtk/gtk.h' for example, or
> > 'cvs diff -u gtk/' would only do the gtk directory.
>
> I already knew that however, the problem is with modifications in the same
> file (a basic example would be entries in Changelog, or you make a modif,
> send the patch and then realize you forgot something -- as of my first
> proposed patch here for two wheels mice handling in GDK).
> Do you have some tips for this kind of things?

I've run across this problem a bit and here's the solution I use: after
you submit each patch, make a copy of the source tree into another
directory. Then make your extra changes and create the diff against the
copy of the directroy. The drawback of this method is that you have to
keep two copies of the source up to date from CVS, but it's not a
perfect world. The advantage (or sometimes drawback) is that your second
accounts for any places where it overlapped your first diff (because it
is against a tree that includes the first set of changes).

Another solution that works sometimes: after making the second set of
changes, apply the first patch as a "reverse diff" (just apply the patch
to your changed tree and diff will work out that it's already been
applied and offer to reverse it). Then you have a copy of the tree
containing your second set of changes by not your first. Note that this
method is a bit less reliable than the first, because if there are any
points were your two sets of changes overlapped, all bets are off.

> P.S.: My last message took 7 hours (!) to get sent me back. I have this
> problem only for gnome-love (and maybe other gnome mailing lists, but not
> their *-request adress). Where can this come from?!

The list is moderated. This is because it has a very defined purpose and
the list managers want to keep things on-topic, so from time to time
threads that are more appropriate or heavily cross-posted to other lists
will be stopped.

Cheers,
Malcolm

-- 
I'm not nearly as think as you confused I am!