You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@codematters.co.uk> on 2003/11/01 01:32:37 UTC

Re: Merging bug

Gustavo Niemeyer <ni...@conectiva.com> writes:

> % svn merge -r 126:158 https://somewhere/apt-rpm/vendor/trunk
[...]
> Skipped missing target: debian/apt.manpages
> svn: Working copy not locked
> svn: directory 'debian' not locked

You don't provide much information, but I fixed some merge bugs in
r7521 that might possibly be this.  What version of Subversion are you
using?

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Merging bug

Posted by Gustavo Niemeyer <ni...@conectiva.com>.
> > % svn merge -r 126:158 https://somewhere/apt-rpm/vendor/trunk
> [...]
> > Skipped missing target: debian/apt.manpages
> > svn: Working copy not locked
> > svn: directory 'debian' not locked
> 
> You don't provide much information, but I fixed some merge bugs in
> r7521 that might possibly be this.  What version of Subversion are you
> using?

Sorry Philip. It was a lame report indeed. I'm using the stable
release 0.32.1 (7497).

-- 
Gustavo Niemeyer
http://niemeyer.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org