You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Amir Guindehi <am...@datacore.ch> on 2003/04/07 11:54:33 UTC
[BUG?] merge with --dry-run fails but without works fine
hi,
i just saw a strange behavior of subversion 0.20.1.
you can reproduce it like this:
svn co https://svn.zebra.datacore.ch/read-only/zebra-ag/trunk zebra-ag
-r 186
cd zebra-ag
if you do:
svn merge https://svn.zebra.datacore.ch/read-only/zebra-pj/trunk . -r
181:182 --dry-run
subversion/libsvn_wc/lock.c:622: (apr_err=155005)
svn: Working copy not locked
svn: no write-lock in: doc <-------------------------- BUG?
if i remove the --dry-run it _works_:
svn merge https://svn.zebra.datacore.ch/read-only/zebra-pj/trunk . -r
181:182
D doc/Makefile.in
D doc/Makefile.in
D ospfclient/Makefile.in
D ospfclient/Makefile.in
D lib/Makefile.in
D lib/Makefile.in
D bgpd/Makefile.in
D bgpd/Makefile.in
D vtysh/Makefile.in
D vtysh/Makefile.in
D ripngd/Makefile.in
D ripngd/Makefile.in
D ripd/Makefile.in
D ripd/Makefile.in
D ospf6d/Makefile.in
D ospf6d/Makefile.in
D zebra/Makefile.in
D zebra/Makefile.in
D ospfd/Makefile.in
D ospfd/Makefile.in
D configure
D configure
D Makefile.in
D Makefile.in
D config.h.in
D config.h.in
D aclocal.m4
D aclocal.m4
just wanted to make you aware of this...
if you need more information email me!
regards
- amir
--
Amir Guindehi, nospam.amir@datacore.ch
DataCore GmbH, Witikonerstrasse 289, 8053 Zurich, Switzerland
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [BUG?] merge with --dry-run fails but without works fine
Posted by Philip Martin <ph...@codematters.co.uk>.
Amir Guindehi <am...@datacore.ch> writes:
> svn merge https://svn.zebra.datacore.ch/read-only/zebra-pj/trunk . -r181:182 --dry-run
> subversion/libsvn_wc/lock.c:622: (apr_err=155005)
> svn: Working copy not locked
> svn: no write-lock in: doc <-------------------------- BUG?
>
> if i remove the --dry-run it _works_:
>
> svn merge https://svn.zebra.datacore.ch/read-only/zebra-pj/trunk . -r
>
> 181:182
> D doc/Makefile.in
Yes, that's a bug. The merge callbacks ignore --dry-run when deleting
items, and then fail when attempting to modify the entries file using
a read-only access baton. Please raise an issue.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org