Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-07 Thread Nico Kadel-Garcia
On Mon, Nov 7, 2011 at 3:30 AM, Stefan Sperling wrote: > On Sun, Nov 06, 2011 at 06:49:07PM -0500, Nico Kadel-Garcia wrote: >> /proc, though.. that one might more awkward to protect. Those are >> nominally "files". Has anyone reviewed trying to protect /proc, or in >> the case I mentioned /var

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-07 Thread Daniel Shahaf
On Sunday, November 06, 2011 6:49 PM, "Nico Kadel-Garcia" wrote: > If device nodes and pipes are protected by being "unversioned" and > impossible to "version", It's definitely possible to have a special file obstruct a versioned file... (svn checkout wc; /bin/rm wc/iota; mk{nod,fifo,..} wc/iot

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-07 Thread Stefan Sperling
On Sun, Nov 06, 2011 at 06:49:07PM -0500, Nico Kadel-Garcia wrote: > /proc, though.. that one might more awkward to protect. Those are > nominally "files". Has anyone reviewed trying to protect /proc, or in > the case I mentioned /var/named/chroot/proc, from misapplied patches? I don't think i

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-06 Thread Nico Kadel-Garcia
On Sun, Nov 6, 2011 at 10:28 AM, Stefan Sperling wrote: > On Sun, Nov 06, 2011 at 08:56:34AM -0500, Nico Kadel-Garcia wrote: >> Stefan, if I may suggest, special-casing file names is leaving trouble >> lying in wait. > > Doing so was apparently git's idea, not ours. Writing tools to translate bet

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-06 Thread Stefan Sperling
On Sun, Nov 06, 2011 at 08:56:34AM -0500, Nico Kadel-Garcia wrote: > Stefan, if I may suggest, special-casing file names is leaving trouble > lying in wait. Doing so was apparently git's idea, not ours. > It would be safer to handle it via special file types. > /dev/null is a "character special"

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-06 Thread Nico Kadel-Garcia
On Sat, Nov 5, 2011 at 1:58 PM, Stefan Sperling wrote: > On Sat, Nov 05, 2011 at 04:37:03PM +0100, Stefan Sperling wrote: >>     Currently, "/dev/null" is not special-cased (it is most certainly >>     special-cased in git), which causes one of the problem where a file >>     is added with a wrong

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-05 Thread Stefan Sperling
On Sat, Nov 05, 2011 at 04:37:03PM +0100, Stefan Sperling wrote: > Currently, "/dev/null" is not special-cased (it is most certainly > special-cased in git), which causes one of the problem where a file > is added with a wrong name. > I think this should be fixed in 'svn patch', so

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-05 Thread Stefan Sperling
On Sat, Nov 05, 2011 at 06:29:16PM +0400, Konstantin Kolinko wrote: > 2011/11/5 Konstantin Kolinko : > > Hi! > > > > My colleague uses Git to work on one of Apache projects. He published > > a patch, but I have problems trying to apply it cleanly with "svn > > patch". There are several described i

Re: Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-05 Thread Konstantin Kolinko
2011/11/5 Konstantin Kolinko : > Hi! > > My colleague uses Git to work on one of Apache projects. He published > a patch, but I have problems trying to apply it cleanly with "svn > patch". > > Source code: > https://svn.apache.org/repos/asf/tomcat/trunk@1197793 > Patch: > http://people.apache.org/~

Failure using "svn patch" with Git patch that adds files. Wrong path is used.

2011-11-05 Thread Konstantin Kolinko
Hi! My colleague uses Git to work on one of Apache projects. He published a patch, but I have problems trying to apply it cleanly with "svn patch". Source code: https://svn.apache.org/repos/asf/tomcat/trunk@1197793 Patch: http://people.apache.org/~markt/patches/2011-11-03-redeploy-trunk-v2.patch