[Phpmyadmin-devel] Release cycle
robbat2 at orbis-terrarum.net
Tue Feb 4 08:48:03 CET 2003
On Tue, Feb 04, 2003 at 11:05:00AM +0100, Garvin Hicking wrote:
> Hi Robin!
> > Look at it this way for later on, say we want to revert just a single
> > feature at some point in time, one of the things you have done. If it is
> > all in one big commit, then it is really messy to split it up later on.
> > Code has been reverted in the past, as needed.
> I see the advantages, but I can't work out how I can technically achieve
> this single patches.
> Say I have made five different patches to the display_tbl.lib.php3. I
> create a patch via the 'cvs -udHwbRN' command and pipe it to a file.
> Should I now manually edit the huge diff-file and split it into the
> several patch files?
For the most part that can be done really easily, look up 'splitdiff'...
> BTW, how can I apply a single external patch file to my cvs tree?
from outside the directory, or inside it, depending on where you took
the patch from
patch -d phpMyAdmin -p 1 -s --dry-run <diff_file
tweak the -d parameter (you might try '.' if you are in the directory)
tweak the -p parameter (change to 0 if using '.')
take out --dry-run once you don't get any errors displayed.
and it will then apply.
> My CVS-problem BTW has disapperead. It was the 6-hour limit of
> sourceforge. Because I thought SSH-login worked, I thought it has to also
> work with cvs, but that was a wrong thought. :-O
Robin Hugh Johnson
E-Mail : robbat2 at orbis-terrarum.net
Home Page : http://www.orbis-terrarum.net/?l=people.robbat2
ICQ# : 30269588 or 41961639
GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 232 bytes
Desc: not available
More information about the Developers