How did you proceed to patch?

Here:
iMac:~ lag$ mv /Users/lag/Desktop/rsync-3.0.0pre8\ 2/patches/ /Users/ lag/Desktop/rsync-3.0.0pre8/
iMac:~ lag$ cd Desktop/rsync-3.0.0pre8
iMac:~/Desktop/rsync-3.0.0pre8 lag$ patch -p1 <patches/acls.diff
patching file acls.c
patching file compat.c
patching file proto.h
iMac:~/Desktop/rsync-3.0.0pre8 lag$ patch -p1 <patches/xattrs.diff
patching file compat.c
patching file xattrs.c
patching file proto.h
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file proto.h.rej
iMac:~/Desktop/rsync-3.0.0pre8 lag$ ./configure
configure.sh: Configuring rsync 3.0.0pre8

And it goes fine... As you said both acl and xattr try to patch proto, just skip the second one and everything is ok.
Dunno if this should be considered a bug or something wanted.

Le 2 févr. 08 à 22:11, Simo Sorce a écrit :

On Sat, 2008-02-02 at 15:41 -0500, Simo Sorce wrote:
On Sat, 2008-02-02 at 18:49 +0100, Vitorio Machado wrote:
It's in separate here http://samba.anu.edu.au/ftp/rsync/rsync-
patches-3.0.0pre8.tar.gz

Oh, thanks, haven't notice any message on the list telling the packages
were separated, sorry for the noise.

xattrs.diff contains the same change to proto.h that acls.diff contain making
patch fail if you apply both (as suggested in xattrs.diff header).

Should I open a bug ?

Simo.

--
Simo Sorce * Red Hat, Inc * New York

--
To unsubscribe or change options: https://lists.samba.org/mailman/ listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart- questions.html

--
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html

Reply via email to