aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2011-02-17 22:07:20 -0800
committerWayne Davison <wayned@samba.org>2011-02-17 22:09:08 -0800
commit86e90c58f46dd13254e0dc38b9eea37589ace457 (patch)
tree75e12ff06a063c3fda89952cfbd4147075e33199
parente1fe1d55c4b9a8d45d9c640cefe45a345371f9d5 (diff)
downloadandroid_external_rsync-86e90c58f46dd13254e0dc38b9eea37589ace457.tar.gz
android_external_rsync-86e90c58f46dd13254e0dc38b9eea37589ace457.tar.bz2
android_external_rsync-86e90c58f46dd13254e0dc38b9eea37589ace457.zip
Add .hg dir exclude to default_cvsignore list.
Fixes bug 7957.
-rw-r--r--exclude.c2
-rw-r--r--rsync.yo2
2 files changed, 2 insertions, 2 deletions
diff --git a/exclude.c b/exclude.c
index a8e830f1..16b2a562 100644
--- a/exclude.c
+++ b/exclude.c
@@ -1036,7 +1036,7 @@ static char default_cvsignore[] =
" *.a *.olb *.o *.obj *.so *.exe"
" *.Z *.elc *.ln core"
/* The rest we added to suit ourself. */
- " .svn/ .git/ .bzr/";
+ " .svn/ .git/ .hg/ .bzr/";
static void get_cvs_excludes(uint32 rflags)
{
diff --git a/rsync.yo b/rsync.yo
index af95b851..65daed54 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1489,7 +1489,7 @@ initial items are marked as perishable -- see the FILTER RULES section):
quote(quote(tt(RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS .make.state
.nse_depinfo *~ #* .#* ,* _$* *$ *.old *.bak *.BAK *.orig *.rej .del-*
-*.a *.olb *.o *.obj *.so *.exe *.Z *.elc *.ln core .svn/ .git/ .bzr/)))
+*.a *.olb *.o *.obj *.so *.exe *.Z *.elc *.ln core .svn/ .git/ .hg/ .bzr/)))
then, files listed in a $HOME/.cvsignore are added to the list and any
files listed in the CVSIGNORE environment variable (all cvsignore names