I'm a bit confused on merging. Example from the help file:
Rev Comments
39. Working on MyBranch
38. Working on trunk
37. Working on MyBranch
36. Create branch MyBranch
35. Working on trunk
34. Working on trunk
...
So assume we have URLs ../trunk and ../MyBranch. My goal is to get the
changes made in MyBranch into trunk.
1. What URL do specify in the From section.
2. What Rev to I specify in the From section.
3. What URL do I specify in the To section?
4. What Rev do I specify in the To section?
Also, I was playing with today ended up with a new folder named after my
branch in my trunk working copy instead merged files. The folder had a big +
sign on it. Please explain.
> -----Original Message-----
> From: SteveKing [mailto:steveking@gmx.ch]
> Sent: Wednesday, August 11, 2004 3:25 PM
> To: dev@tortoisesvn.tigris.org
> Subject: Re: [TSVN] Branch Merge Error
>
> Brad Rhoads wrote:
> > I'm using svn 1.0.5 and TortoiseSVN 1.0.8, Build 1430.
> >
> > When trying to merge a branch I'm getting the following error:
> >
> > REPORT request failed on '/svn/synapse/!svn/vcc/default'
> > Invalid editor anchoring; at least one of the input
> paths is not a
> > directory and there was no source entry
> >
> > I have a WC of my trunk, and in the merge dialog I specify
> the URL to
> > my branch in both the To & the From.
>
> Check the URL. Seems that the URL is not correct, or does not
> exist in the revision(s) you specified. Maybe you have
> renamed that folder?
> And try (for testing) to switch the Revision numbers (from <-> to).
> There was a bug in TSVN which had those two exchanged, but
> I'm not sure anymore if that was fixed in 1.0.8 or later.
>
> Stefan
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 09:08:39 2004