On 10/4/06 10:55 AM, "Mark Phippard" <markp@softlanding.com> wrote:
> Jay Sachs <jay.sachs@riskmetrics.com> wrote on 10/04/2006 10:34:50 AM:
>
>> No, it did not. 9942 was the revision that saw the creation of the
> branch.
>> There were several more commits on trunk, one commit to the branch, and
> then
>> several more to trunk before I attempted the merge.
>
> I touched on this before. From everything I know about Subversion (which
> is actually quite a lot) if you created the branch in r9942 then when you
> are merging, you should not be including that revision in the merge (you
> are specifying 9941). If you do, then the merge tries to create the root
> folder in your WC which leads to that error message. I would specify
> r9942 as the From revision on the merge, which would mean the changes in
> that revision would not be considered. Or try my suggestion of using the
> Select Revision option and selecting the range of revisions that contain
> the changes you want to merge.
The problem here is that specifying 9942 doesn't work. The branch and the
changes *on the branch* were both accomplished in the same revision (9942).
Let's go back to the creation of the branch. The developer had a large
number of changes uncommitted, and I asked him to commit them to a branch.
So he used Subclipse Team->Branch to do this. Subclipse doesn't do this in
two commits, it does it in one, which I know is possible on the cmd line via
an 'svn copy' specifying a WCPath as source and a URL as a dest (I presume
this is effectively how Subclipse accomplishes this.) Once you've made that
commit, though, there seems to be no way to capture any changes made without
including the revision in which the branch was created.
[In regards to your parenthetical remark, I don't think I've said anything
to question your understanding of the internals or usage of Subversion or
Subclipse. However, if I came across that way, I apologize -- it was
certainly completely uninentional.]
j.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Oct 4 17:12:03 2006