Senthil Kumaran S <senthil_at_collab.net> wrote on 2010/05/24 09:07:20:
>
> Joakim Tjernlund wrote:
> > #fails with:
> > #svn: Commit failed (details follow):
> > #svn: Cannot commit both '/usr/local/src/my_wc/branches/b1/proj/file' and '/
> usr/local/src/my_wc/branches/b1/bin/file' as they refer to the same URL
> >
> > #svn, version 1.6.9 (r901367)
>
> This behavior stands corrected in trunk. But still 1.6.x branch behaves the
> same way as you observe. Additionally, in trunk we get the following error,
> when we do an 'svn up' in some steps,
I see, I noticed that the error seems to caused by excessive svn:mergeinfo
being added:
svn diff my_wc
Property changes on: my_wc/branches/b1
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk:r6
Index: my_wc/branches/b1/bin/file
===================================================================
--- my_wc/branches/b1/bin/file (revision 6)
+++ my_wc/branches/b1/bin/file (working copy)
@@ -1 +1,2 @@
rev1
+rev2
Property changes on: my_wc/branches/b1/proj
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/proj:r6*
Property changes on: my_wc/branches/b1/proj/file
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/proj/file:r6
svn propdel -R svn:mergeinfo my_wc/branches/proj
fixes it.
This appears to be a bug as well, svn:mergeinfo should not be added
in this case as far as I can tell.
>
> <snip>
> Fetching external item into 'my_wc/trunk/proj/file'
> svn: warning: The file external from 'file:///tmp/my_repo/trunk/bin/file'
> cannot overwrite the existing versioned item at '/tmp/my_wc/trunk/proj/file'
> </snip>
>
> The above error does not pop up in svn 1.6.x versions. I am looking into it. We
> should not try overwriting an already fetched file externals item.
hmm, I recall seeing this at one of my coworkers computer after a similar
merge. This was on subversion 1.6.x
Received on 2010-05-24 09:51:23 CEST