Re: Problems Merging

On Mon, 2004-05-10 at 16:10, Stephen Hansen wrote:
> Hi all.
>
> I'm a fairly new user to Subversion and have been using it on new
> projects around the office, and have run into a bit of a problem with
> merging. I branched /trunk/Python into /branch/omniorb awhile back to do
> some extensive work, and now would like to merge my changes back into
> the trunk. So, I do:
>
> svn merge http://192.168.180.69/svn/repos/branch/omniorb
> http://192.168.180.69/svn/repos/trunk/Python

You're making the "classic" mistake trying to compare the trunk with the
branch. Go read this section of the book:

http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 10 23:21:33 2004