RE: Problems Merging

On Tue, 2004-05-11 at 11:18, Stephen Hansen wrote:

> > 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.

Notice what I'm saying above: you should compare two specific trees:
trunk@173 should be compared with branch@HEAD.

> heka Python # svn merge -r 180:HEAD
> http://localhost/svn/repos/branch/omniorb

And here's you're comparing branch@180 with branch@HEAD. That's wrong.

> 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.

Correct.

>
> 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.

I'm asking you to compare two "snapshots": a snapshot of trunk@173, and
a snapshot of the branch as it looks right now. Don't worry about all
the "stuff that happened inbetween". The point is if that if you
compare those two snapshots, the result will be a patch that exactly
describes all the branch changes.

Let me spell out the command for you:

$ cd trunk-wc
$ svn merge http://localhost/svn/repos/trunk@173
            http://localhost/svn/repos/branch/omniorb@HEAD

---------------------------------------------------------------------
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:26:53 2004