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

Re: Merge problem with workaround

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-06-24 02:43:44 CEST

> It seems to me that having the revision field populate a "9" when I
choose revision "10" is a bug.
> But I'm still new to Subversion (not to mention Subclipse) and so I'm not
sure if this is by design.

It is by design. In the Show Log you can select the range of revisions you
want to merge, and we will populate the dialog with those selections. As
an example, let's say you want to merge just revision 10. The syntax for
that is this:

svn merge -r9:10

Let's say you wanted 11 and 12. The syntax for that is:

svn merge -r 10:12

In your case, the problem is that revision 10 is the revision when you
created the branch. So you cannot merge that revision. You really wanted
revisions 11 and 12.

> svn merge -r 9:HEAD file:///working/svnrepo/echo/branches/b1/src/min/java
> svn merge -r 10:HEAD

If everything you wrote was correct, there is absolutely no way that first
command above would work. It would have given the exact error you showed

We implemented our dialog exactly the same as TortoiseSVN. I mention this
only because they have better docs than we do. See how they explain it:



Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
Received on Fri Jun 24 10:43:44 2005

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

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