You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Blair Zajac <bl...@orcaware.com> on 2003/08/21 15:14:54 UTC
Re: svn commit: rev 6810 - in trunk/subversion: include libsvn_client
libsvn_wc tests/clients/cmdline
cmpilato@collab.net wrote:
>
> Blair Zajac <bl...@orcaware.com> writes:
>
> > sussman@tigris.org wrote:
> > >
> > > Author: sussman
> > > Date: Thu Aug 21 00:39:42 2003
> > > New Revision: 6810
> > >
> > > Modified:
> > > trunk/subversion/include/svn_wc.h
> > > trunk/subversion/libsvn_client/diff.c
> > > trunk/subversion/libsvn_client/repos_diff.c
> > > trunk/subversion/libsvn_wc/diff.c
> > > trunk/subversion/tests/clients/cmdline/merge_tests.py
> > > Log:
> > > Fix issue #1425: don't let 'svn merge' bomb out when it hits
> > > unversioned obstructions during adds/deletes/changes of files/dirs.
> > > Instead, just 'skip' them and move on. This allows tree-deltas to
> > > simply have "failed hunks", which happens all the time in patch
> >
> > Isn't that "failed chunks"???
>
> $ patch -p0 < unrelated-patchfile.txt
> patching file iota
> Hunk #1 FAILED at 30.
> Hunk #2 FAILED at 152.
> Hunk #3 FAILED at 174.
> Hunk #4 FAILED at 212.
> Hunk #5 FAILED at 291.
> Hunk #6 FAILED at 310.
> 6 out of 6 hunks FAILED -- saving rejects to file iota.rej
Thanks. When I saw the word hunks, I didn't think of the patch kind.
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 6810 - in trunk/subversion: include libsvn_client
libsvn_wc tests/clients/cmdline
Posted by Blair Zajac <bl...@orcaware.com>.
cmpilato@collab.net wrote:
>
> Blair Zajac <bl...@orcaware.com> writes:
>
> > Thanks. When I saw the word hunks, I didn't think of the patch kind.
>
> Oh, were you thinking of the 'Jon Stamos' failed hunk kind?
Closer to that, but getting your own TV show isn't a failure in
my book.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 6810 - in trunk/subversion: include libsvn_client libsvn_wc tests/clients/cmdline
Posted by cm...@collab.net.
Blair Zajac <bl...@orcaware.com> writes:
> Thanks. When I saw the word hunks, I didn't think of the patch kind.
Oh, were you thinking of the 'Jon Stamos' failed hunk kind?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org