Merge problems

We're using subversion 1.0.3 and we're running into a bunch of issues
with merging now.

Our repository structure is as follows:

/

 |- main/

 |- projects/

            |- rowsource/

Rowsource is a copy of the main line at revision 234.

At some point, our main line is at revision 253. So, I want run the
following command in the working directory for rowsource

svn merge -r 234:HEAD svn://subversion.interlacesystems.com/main

Before I commit (hours later), there have been numerous changes to the
main line and now it's on revision 270.

I commit my changes on my project branch.

Now I want to run a merge again from the main line to the project
branch. What is the command that I need to run?

svn merge -r 253:HEAD
svn://subversion.interlacesystems.com/projects/rowsource

This seems to pick up all of the changes at 253 (which is not correct)

svn merge -r 270:HEAD
svn://subversion.interlacesystems.com/projects/rowsource

doesn't pick up anything.

This is way too confusing. Right now, I'm banging my head against this
trying to figure out how to make this simpler for our developers who
will run into similar use cases.

Anil

                         
Received on Thu May 20 21:12:49 2004