Robert,
At first sight I have no idea. If you have a true recipe of what you
did ( all the svn commands you executed in order ) we can probably
explain this behaviour. Without recipe I'm afraid that's not possible.
Lieven.
> -----Original Message-----
> From: Bjervås Robert [mailto:robje@wmdata.com]
> Sent: donderdag 2 februari 2006 10:47
> To: Lieven Govaerts; users@subversion.tigris.org
> Subject: SV: REPORT request failed on '/svn/rf/!svn/vcc/default'
>
> Hello Lieven,
>
> First of all, I have solved the issue by removing all files
> that was marked as "R" after the merge. That is I did a new
> check out, removed the files, merged and finally comitted the change.
>
> But I'm still confused, why didn't commit fix it. The status
> was R so merge did understand that it was two different files
> with the same name (they had no common history). I checked
> the log and DummyDAOFactory.java was replaced by an remove +
> add in the temp branch by misstake so the history was lost.
>
> /Robert
>
> > -----Ursprungligt meddelande-----
> > Från: Lieven Govaerts [mailto:lgo@mobsol.be]
> > Skickat: den 1 februari 2006 21:41
> > Till: Bjervås Robert; users@subversion.tigris.org
> > Ämne: RE: REPORT request failed on '/svn/rf/!svn/vcc/default'
> >
> >
> > Robert,
> >
> > can you give a small overview of your consecutive actions?
> >
> > It seems that the file DummyDAOFactory.java in the temp branch is
> > added independently of the file DummyDAOFactory.java in the trunc
> > branch.
> >
> > According to the svn book, the 'R' flag means:
> >
> > R foo
> > File or directory foo was Replaced in your working copy;
> that is,
> > foo was deleted, and a new item with the same name was added. While
> > they may have the same name, the repository considers them to be
> > distinct objects with distinct histories.
> >
> > Lieven.
> >
> > > -----Original Message-----
> > > From: Bjervås Robert [mailto:robje@wmdata.com]
> > > Sent: woensdag 1 februari 2006 11:10
> > > To: users@subversion.tigris.org
> > > Subject: REPORT request failed on '/svn/rf/!svn/vcc/default'
> > >
> > > Hi,
> > >
> > > I have a problem after merging to branches.
> > >
> > > > svn merge http://192.168.1.10/svn/rf/branches/trunc
> > > > http://192.168.1.10/svn/rf/branches/temp
> > >
> > > The merge did go well but when I try to run any command
> connecting
> > > the server I receive the same message
> > >
> > > > svn update
> > > > REPORT request failed on '/svn/rf/!svn/vcc/default'
> > > > Working copy path
> > > > 'temp/develop/src/com/rf/svc/db/DummyDAOFactory.java' does
> > > not exist
> > > > in repository
> > >
> > > This is strange because the file exist in both the rf
> branch and the
> > > temp branch. The status is:
> > >
> > > > $ svn status | grep "DummyDAOFactory.java"
> > > > R + develop\src\com\rf\svc\db\DummyDAOFactory.java
> > >
> > > Do anyone know how to fix this issue?
> > >
> > >
> > > Best Regards
> > > /Robert
> >
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.375 / Virus Database: 267.15.0/248 - Release
> Date: 1/02/2006
>
>
--
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.1.375 / Virus Database: 267.15.0/248 - Release Date: 1/02/2006
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 2 22:55:06 2006