[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-05-11 01:21:11 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.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 11 01:25:41 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.