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

Re: svn merge reports skipped misisng fictional files

From: <kfogel_at_collab.net>
Date: 2005-12-22 18:08:30 CET

Bob Peterson <bob@memento-inc.com> writes:
> I just don't grok Subversion sometimes. Here I try to merge and get
> an error about a fictional extra subfolder.
>
> svn mkdir http://server/svn/src/branches/bob
> This one I grok. It makes a folder named "bob".
>
> svn copy http://server/svn/src/trunk/xyz
> http://server/svn/src/branches/bob/xyz
> I grok this too. When I checkout bob I get a folders bob and bob/xyz
> and their contents alright. I even see the repository looking normal
> when I list it.
>
> svn merge -r 7394:7401 http://server/svn/src/trunk
> But when I try to merge from trunk I get the error for skipping two
> missing targets, mysteriously named "...bob\xyz\xyz\file1.cs" and
> "...bob\xyz\xyz\file2.resx". This extra layer of \xyz\ makes no
> sense. There was never such an extra subfolder that I can recall, but
> maybe there was in the far gone mists of time. Long before I did the
> mkdir. This smells faintly of another of my recently reported
> problems with merge. I blew away the old branch and started from a
> fresh copy. "Fortunately" I ran into -this- S.N.A.F.U. before I
> started developing in the new branch.

Well, at the risk of sounding cold and cruel... Can you script this up
as a reproducible bug? If so, we can probably fix it.

-Karl

-- 
www.collab.net  <>  CollabNet  |  Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 25 00:39:48 2005

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