[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge bugs

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-02-15 00:16:14 CET

This looks like a serious bug. Basically, 'svn merge' is trying to
apply a diff within a directory that (legitimately) no longer exists
in the wc. This shouldn't be throwing a fatal access-baton-locking
error; instead, it should throw a simple warning and continue on.
It's no worse than when 'patch' complains about failing to apply a
hunk.

Philip, might you be able to look at this? It's probably just a
matter of relaxing our access-baton system a bit in certain places.

Gustavo Niemeyer <niemeyer@conectiva.com> writes:

> I've got some problems trying to use merge. In the branch I'm working
> on, test/CVS has been removed, but in the branch I'm trying to merge,
> it hasn't. Here's what i get:
>
>
> [niemeyer_at_ibook ~/src/apt-rpm]% svn merge -r 20:21 https://oops.kerneljanitors.org/repos/apt-rpm/vendor/trunk
> svn: Working copy not locked
> svn: directory not locked (test/CVS)
> [niemeyer_at_ibook ~/src/apt-rpm]% svn merge -r 20:21 https://oops.kerneljanitors.org/repos/apt-rpm/vendor/trunk
>
>
> Even creating the directory, it still fails with a similar problem:
>
>
> [niemeyer@ibook ~/src/apt-rpm]% cd test
> [niemeyer@ibook ..rc/apt-rpm/test]% svn mkdir CVS
> A CVS
> [niemeyer@ibook ..rc/apt-rpm/test]% cd ..
> [niemeyer_at_ibook ~/src/apt-rpm]% svn merge -r 20:21 https://oops.kerneljanitors.org/repos/apt-rpm/vendor/trunk
> svn: Can't find an entry
> svn: svn_wc_merge: `test/CVS/Entries' not under revision control
> [niemeyer@ibook ~/src/apt-rpm]%
>
>
> --
> Gustavo Niemeyer
>
> [ 2AAC 7928 0FBF 0299 5EB5 60E2 2253 B29A 6664 3A0C ]
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Feb 14 22:18:43 2003

This is an archived mail posted to the Subversion Dev mailing list.