Re: protecting files from deletion, and using --delete-excluded

2006-09-05 Thread Wayne Davison
On Tue, Sep 05, 2006 at 10:31:35AM +0200, Christophe LYON wrote: > Do you plan an official release with this patch included soon? There are several important bug-fixes in CVS that I would like to get out into a 2.6.9 version sooner rather than later. I just wish I had more time test out the daemo

Re: protecting files from deletion, and using --delete-excluded

2006-09-05 Thread Christophe LYON
Matt McCutchen wrote: On 9/4/06, Christophe LYON <[EMAIL PROTECTED]> wrote: It seems that the problem is not really solved :-( You're using rsync 2.6.8 with only my first patch, right? By fixing one bug (merge files being lost altogether), that patch revealed the bug you're seeing now ("-" ru

Re: protecting files from deletion, and using --delete-excluded

2006-09-04 Thread Matt McCutchen
On 9/4/06, Christophe LYON <[EMAIL PROTECTED]> wrote: It seems that the problem is not really solved :-( You're using rsync 2.6.8 with only my first patch, right? By fixing one bug (merge files being lost altogether), that patch revealed the bug you're seeing now ("-" rules in merge files not

Re: protecting files from deletion, and using --delete-excluded

2006-09-04 Thread Christophe LYON
Matt, It seems that the problem is not really solved :-( If I understand correctly, I have to send the filter file to the receiver, so that it can be used for deletion phase, right? So I added --filter='+ /rsync-filter' to my options. That is, I start rsync -rltgoDuvR --delete-after --delete-

Re: protecting files from deletion, and using --delete-excluded

2006-08-31 Thread Matt McCutchen
On 8/31/06, Wayne Davison <[EMAIL PROTECTED]> wrote: I checked in some more code that fixes the latest problem you pointed out (the dropping of include/exclude rules read from merge files on the receiving side). I would never have realized that filters might appear before --delete-excluded on t

Re: protecting files from deletion, and using --delete-excluded

2006-08-31 Thread Wayne Davison
On Thu, Aug 31, 2006 at 07:32:57PM -0400, Matt McCutchen wrote: > I assume you mean receiving rsync versions too old to understand -C > and :C? Yeah. I got bit by this once before, so I'm now wary to ensure that we keep the -C option backward compatible. I checked in some more code that fixes th

Re: protecting files from deletion, and using --delete-excluded

2006-08-31 Thread Matt McCutchen
On 8/31/06, Wayne Davison <[EMAIL PROTECTED]> wrote: No, it's just an incomplete fix. In order to be compatible with older rsync versions, we must continue to completely eliminate the .cvsignore file when --delete-excluded is used (or else we'd get spurious errors about the filter rules being to

Re: protecting files from deletion, and using --delete-excluded

2006-08-31 Thread Wayne Davison
On Thu, Aug 31, 2006 at 06:09:08PM -0400, Matt McCutchen wrote: > That's the wrong fix. No, it's just an incomplete fix. In order to be compatible with older rsync versions, we must continue to completely eliminate the .cvsignore file when --delete-excluded is used (or else we'd get spurious erro

Re: protecting files from deletion, and using --delete-excluded

2006-08-31 Thread Matt McCutchen
On 8/31/06, Wayne Davison <[EMAIL PROTECTED]> wrote: Yes, the code needs to continue to dump .cvsignore files. That's the wrong fix. In the presence of --delete-excluded, filters in .cvsignore aren't ineffective because they're in .cvsignore; they're ineffective because they are exclude filter

Re: protecting files from deletion, and using --delete-excluded

2006-08-31 Thread Wayne Davison
On Wed, Aug 30, 2006 at 08:44:41PM -0400, Matt McCutchen wrote: > To get in the habit, I wrote a test case to catch the bug; it is attached. Thanks. I added this test into the delete test code. > My patch breaks the "exclude" test case because it seems to make rsync > treat patterns in .cvsignor

Re: protecting files from deletion, and using --delete-excluded

2006-08-30 Thread Matt McCutchen
To get in the habit, I wrote a test case to catch the bug; it is attached. My patch breaks the "exclude" test case because it seems to make rsync treat patterns in .cvsignore files on the receiver as protect filters. I'm not sure what to do about this. Matt dnemflrde.test Description: Binary d

Re: protecting files from deletion, and using --delete-excluded

2006-08-30 Thread Matt McCutchen
I squished the bug! Attached is a patch. The name stands for "Do Not Elide Merge Files on a Local Receiver with --delete-excluded". Matt ### Eclipse Workspace Patch 1.0 #P rsync Index: exclude.c === RCS file: /cvsroot/rsync/exclude

Re: protecting files from deletion, and using --delete-excluded

2006-08-30 Thread Matt McCutchen
On 8/30/06, Christophe LYON <[EMAIL PROTECTED]> wrote: I still see rsync remove all my r3* dirs in the destination: [...] deleting r3.0/ This is a bug! I can reproduce it in CVS rsync. I'm investigating. Matt -- To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync

Re: protecting files from deletion, and using --delete-excluded

2006-08-30 Thread Christophe LYON
Matt McCutchen wrote: On 8/29/06, Christophe LYON <[EMAIL PROTECTED]> wrote: At some point I have mirrored all of them, but now I want to be able to tell rsync to: - remove all r1.* and r2.* releases - skip r3.* releases (ie don't scan them, but don't delete them) - sync r4.* releases I am tryi

Re: protecting files from deletion, and using --delete-excluded

2006-08-29 Thread Matt McCutchen
On 8/29/06, Christophe LYON <[EMAIL PROTECTED]> wrote: At some point I have mirrored all of them, but now I want to be able to tell rsync to: - remove all r1.* and r2.* releases - skip r3.* releases (ie don't scan them, but don't delete them) - sync r4.* releases I am trying to use filters: + /r

protecting files from deletion, and using --delete-excluded

2006-08-29 Thread Christophe LYON
Hi all, I am trying to write a script based on rsync to help users select what they want to mirror, what they want to skip and what they want to delete on the remote side. Let's say that I have 1 directory per release: r1.0 r1.1 r2.0 r2.1 r3.1 r3.2 r4.0 r4.1 At some point I have mirrored all