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

Re: Serious merge bug?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 10 Oct 2008 23:21:43 +0200

Robert Dailey wrote:
> On Fri, Oct 10, 2008 at 4:16 PM, Stefan Küng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>> wrote:
>
> Robert Dailey wrote:
> > On Fri, Oct 10, 2008 at 4:10 PM, Robert Dailey <rcdailey_at_gmail.com
> <mailto:rcdailey_at_gmail.com>
> > <mailto:rcdailey_at_gmail.com <mailto:rcdailey_at_gmail.com>>> wrote:
> >
> > On Fri, Oct 10, 2008 at 3:46 PM, Robert Dailey
> <rcdailey_at_gmail.com <mailto:rcdailey_at_gmail.com>
> > <mailto:rcdailey_at_gmail.com <mailto:rcdailey_at_gmail.com>>> wrote:
> >
> > On Fri, Oct 10, 2008 at 3:41 PM, Stefan Küng
> > <tortoisesvn_at_gmail.com <mailto:tortoisesvn_at_gmail.com>
> <mailto:tortoisesvn_at_gmail.com <mailto:tortoisesvn_at_gmail.com>>> wrote:
> >
> > Robert Dailey wrote:
> > > Hi,
> > >
> > > As usual, I'm not sure if this is TSVN or SVN
> related, so
> > I'll start by
> > > reporting the issue here.
> > >
> > > Below is an error I received while trying to merge a
> large
> > range of
> > > revisions into a feature branch from trunk. I chose the
> > 1st of the 3
> > > merge options in the merge dialog. Any ideas what this
> > could be?
> > >
> > > /Command: Merging revisions 490-673 of
> > > http://10.3.1.50:1337/svn/vfxrepo/vfx/trunk into
> > C:\IT\work\jewett,
> > > respecting ancestry, Test Only
> > > Error: Working copy path
> > > Error:
> >
> 'vfx/terrain/build/PlanetViewer/data/planets/p2/terrain_type/00
> > -
> > > Base' does
> > > Error: not exist in repository
> > > Finished!/
> >
> > Hmm - just saw in another mail from you that you're
> using a
> > nightly
> > build. I think that might be a problem: there's
> currently a
> > lot of API
> > rewriting going on in the library (all APIs dealing with
> > paths/urls are
> > split up into separate APIs for paths and urls, and
> that of
> > course leads
> > to new bugs which are fixed daily).
> > I'll update to the latest svn trunk maybe this weekend.
> >
> >
> > Well I'm using the nightly build knowing that risk. I'm
> doing it
> > to possibly help test the software and report as many bugs as
> > possible in order to help the software improve and evolve.
> >
> >
> > The path actually does exist.
> >
> > I downgraded back to TortoiseSVN 1.5.3 release (The newest
> release)
> > and decided to try the merge again. I followed the exact same
> steps
> > I did before, and now I'm getting this error message:
> >
> > /Command: Merging revisions 490-673 of
> > http://10.3.1.50:1337/svn/vfxrepo/vfx/trunk into
> C:\IT\work\jewett2,
> > respecting ancestry, Test Only
> > Error: URL
> > Error:
> >
> 'http://10.3.1.50:1337/svn/vfxrepo/vfx/trunk/vfx/terrain/build/PlanetViewer/data/planets/p2/terrain_type/03
> >
> > Error: - Grass' is malformed or the scheme or host or path is
> missing
> > Finished!: /
> >
> > Any idea what this means? If you need more information let me
> know.
> >
> >
> > After some research, it seems like it doesn't like spaces in the
> > filenames. Read this thread:
> > http://archive.netbsd.se/?ml=subversion-bugs&a=2008-09&m=8389386
> <http://archive.netbsd.se/?ml=subversion-bugs&a=2008-09&m=8389386>
> > <http://archive.netbsd.se/?ml=subversion-bugs&a=2008-09&m=8389386
> <http://archive.netbsd.se/?ml=subversion-bugs&a=2008-09&m=8389386>>
>
> Seems to be the reason, yes. The issue is still open though:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3278
>
> Stefan
>
>
> Wow, I can't believe this isn't fixed yet. My branch is absolutely
> screwed! I can't sync with trunk anymore! How am I supposed to work
> around this?!

Please add a comment to that existing issue.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-10-10 23:22:09 CEST

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