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

Re: assertion hit in svn merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-05-31 17:24:30 CEST

On May 31, 2005, at 10:03 AM, David Faure wrote:

> The removal of a directory called "kspread" was (wrongly) committed
> in revision 420162.
>
> To revert that, I tried
> $ svn merge -r420162:420161 svn+ssh://dfaure@svn.kde.org/home/kde/
> branches/stable/l10n/it/docs/koffice/kspread
> svn: File not found: revision 420203, path '/branches/stable/l10n/
> it/docs/koffice/kspread'
> Well, of course it doesn't exist anymore, I want to revert its
> removal.....
>
> So instead I tried:
>
> $svn merge -rBASE:PREV kspread
> svn: 'kspread' has no URL
> (... why doesn't it use the url of the current directory as base?
> "svn info" shows the right url)

You're asking merge to compare two snapshots of 'kspread', but the
problem is that one of the snapshots doesn't exist. So don't do
that. Compare two snapshots of the *parent* directory instead:

$ svn merge -r420162:420161 svn+ssh://dfaure@svn.kde.org/home/kde/
branches/stable/l10n/it/docs/koffice/

Or, the much simpler solution: just copy the directory back to your
working copy, so that it ends up scheduled for addition (with history):

$ svn copy -r420161 \
   svn+ssh://dfaure@svn.kde.org/home/kde/branches/stable/l10n/it/docs/
koffice/kspread \
   kspread

>
> $ svn mkdir kspread
> $ svn merge -rBASE:PREV kspread
> svn: subversion/libsvn_ra_svn/marshal.c:421: vwrite_tuple:
> Assertion `opt || ((rev) >= 0)' failed.
> ^ bug?
>

Hm, maybe.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 31 17:28:36 2005

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