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

RE: Problems Merging

From: Stephen Hansen <shansen_at_advpubtech.com>
Date: 2004-05-11 18:18:49 CEST

> On Mon, 2004-05-10 at 18:15, Stephen Hansen wrote:
> > Some changes were made, from 174-183, which ended up being
> a big horny
> > issue, so it was decided to branch them off into another
> universe. So,
> > 183 was branched off into /branch/omniorb, and then the
> state of the
> > trunk/ repository was reverted back to what it was at 173. It
> > continued along doing stuff. The branch changes were
> finished, and the
> > repository level is now 217.
> Okay, so then let's talk through this.
> What you're saying is that the beginning of the changes
> *actually* started in revision 173 of trunk, right? Then
> trunk@183 was copied to a branch, where the changes continued.
> So what's going on here is that you're producing an incomplete patch.
> If you compare branch@183 with branch@HEAD, that doesn't
> include all the changes, right? The changes *really* started
> at trunk@173, then continued in the branch.
> So I speculate that if you have the merge command compare
> trunk@173 with branch@HEAD, you'll see the complete set of
> changes. And those should apply cleanly to the latest trunk tree.

That makes sense, except any changes that were made in trunk were
supposed to have been reverted. But even if I'm misunderstanding
something there, if I attempt to merge any revision earlier then
branch@185 to the trunk, it fails. 185 is when the /branch/omniorb was
actually created.

heka Python # svn merge -r 180:HEAD
svn: REPORT request failed on '/svn/repos/!svn/vcc/default'
Invalid editor anchoring; at least one of the input paths is not a
directory and there was no source entry

So, at r180(did digging, this is the real revision that 'started' the
process, when the branch happened at r185) /branch/omniorb doesn't
exist, and I think that's why the error is happening.

I can manually commit these changes into the trunk if I need to if the
wacky edit/revert/branch/merge thing I did (in ignorance, I admit) has
made this too difficult.

Thanks for your assistance.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 11 18:19:30 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.