On Thu, Jan 09, 2003 at 12:25:29AM +0000, Jon Middleton wrote: > On Wed, Jan 08, 2003 at 04:00:23PM -0800, jw schultz wrote: > > On Wed, Jan 08, 2003 at 11:24:03PM +0000, Jon Middleton wrote: > > > > > > The attached patch adds the Subversion adm directory (.svn) to the > > > list of excludes for the --cvs-exclude option and also updates the man > > > page. > > > I wonder if it shouldn't be ".svn/". > > I also don't care much for the inconstistant puctuation. > > It could be ".svn/", but I just added it in the same format as the > other entries in the list.
My comment was as much for the maintainders as you. - "RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*", + "RCS/", "SCCS/", "CVS/", "CVS.adm", "RCSLOG", "cvslog.*", Might be worth doing to tighten the patterns. > > > Is the .svn directory the only addition appropriate for > > subversion? No new file prefixes or suffixes from update > > conflicts? > > Subversion creates the following files durning a conflicted update > > *.mine > *.rOLDREV > *.rNEWREV > > where OLDREV and NEWREV are the version number of that file in the > repository, but I think they are a bit too generic to be excluded. > > > Also, it is the rsync.yo file that needs updating. rsync.1 > > is derived via yodl. > > I've attached a updated patch attached. Very good. We'll see if anything comes of it. > > -- > Jon > > "First things first -- but not necessarily in that order" > -- The Doctor, "Doctor Who" > diff -Nur -x 'debian*' -x shconfig -x '*~' rsync-2.5.5/exclude.c >rsync-2.5.5-modified/exclude.c > --- rsync-2.5.5/exclude.c 2002-02-18 19:10:28.000000000 +0000 > +++ rsync-2.5.5-modified/exclude.c 2003-01-08 22:41:10.000000000 +0000 > @@ -390,7 +390,7 @@ > "tags","TAGS",".make.state",".nse_depinfo", > "*~", "#*", ".#*", ",*", "*.old", "*.bak", "*.BAK", "*.orig", > "*.rej", ".del-*", "*.a", "*.o", "*.obj", "*.so", "*.Z", "*.elc", "*.ln", > - "core",NULL}; > + "core", ".svn",NULL}; > > > > diff -Nur -x 'debian*' -x shconfig -x '*~' rsync-2.5.5/rsync.yo >rsync-2.5.5-modified/rsync.yo > --- rsync-2.5.5/rsync.yo 2002-02-06 21:20:49.000000000 +0000 > +++ rsync-2.5.5-modified/rsync.yo 2003-01-09 00:05:31.000000000 +0000 > @@ -551,7 +551,7 @@ > > quote(RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS .make.state > .nse_depinfo *~ #* .#* ,* *.old *.bak *.BAK *.orig *.rej .del-* > -*.a *.o *.obj *.so *.Z *.elc *.ln core) > +*.a *.o *.obj *.so *.Z *.elc *.ln core .svn) > > then files listed in a $HOME/.cvsignore are added to the list and any > files listed in the CVSIGNORE environment variable (space delimited). -- ________________________________________________________________ J.W. Schultz Pegasystems Technologies email address: [EMAIL PROTECTED] Remember Cernan and Schmitt -- To unsubscribe or change options: http://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.tuxedo.org/~esr/faqs/smart-questions.html