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

Re: svn merge question

From: jonatan <jonatan_at_wineasy.se>
Date: 2003-01-06 10:47:53 CET

> 3) svn merge https://.../trunk https://.../branches/OBJS1 .
>
> the third step segfaulted (stack trace below). I tried again, with
> the "--dry-run" arg, and seems to be blowing up because it can't merge
> properties on a file that was created on the branch:
>
> svn: Can't find an entry
> svn: Can't merge props into 'docs/samplecode.html':it's not under
> revision control.

I just ran into the same problem. Same scenario, I had added a file
('abc/def') in the merged area (trunk in my case). I had also added a
'svn:ignore' property to the file's parent directory ('abc'). I used
'svn merge -r22:HEAD https://.../trunk/abc ./abc'. I got the same
result from --dry-run:

U abc/ghi
subversion/libsvn_wc/props.c:376: (apr_err=150000)
svn: Can't find an entry
svn: Can't merge props into 'abc/def':it's not under revision control.

But it didn't segfault without --dry-run, it said:

U abc/ghi
subversion/libsvn_wc/lock.c:108: (apr_err=155004)
svn: Attempted to lock an already-locked dir
svn: working copy locked: abc
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for
details)

I ran 'svn cleanup', 'svn revert -R abc', and tried the merge again.
Same result.

Server is r3987, client is r4XXX (from about Dec 28).

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 6 10:48:52 2003

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