On 10/29/07, Francesco Zanitti <f.zanitti@tecnoteca.it> wrote:
> Hi everybody,
> recently we have begun to use the subversion repository and now i'm facing
> the following problem with subclipse plugin (got the same problem with
> command line tool too):
>
> the repository is quite simple:
>
> /NewFeatureBranch--(rev.242)--
> /
> MainTrunk--------------(rev.252)-----------------------
>
>
> that is, we have a main trunk where we resolve bugs and i've started a new
> branch to develop a new feature of our product.
>
> Now i need to reflect the bug fix in the main trunk to the NewFeatureBranch
> , so i've tried to do a merge with the main trunk (head revision for both,
> tried also with "ignore ancestry").
> The results are that the working copy now is exactly the same as the main
> trunk. The new files i've done in the branch have gone and the files i've
> updated have been "reverted" to the ones in the MainTrunk.
> Clearly i'm missing something!
>
> I've tried also with the command line tools, issuing the following command:
> svn checkout
> svn://192.168.1.29/repository/MyProject/branches/NewFeatureBrach_at_HEAD
> nfb
> svn merge --ignore-ancestry
> svn://192.168.1.29/repository/MyProject/branches/NewFeatureBrach_at_HEAD
> svn://192.168.1.29/repository/MyProject/trunk/MainTrunk_at_HEAD
> nfb
>
> with no luck (the names are not real for purpose, i try to make them
> auto-explicative), the wirking copy nfb contains the same files as the
> MainTrunk.
>
> The same thing happens if i try to make the inverse (porting the changes
> from the NewFeatureBranch to the MainTrunk): the changes we've made to the
> MainTrunk are lost and the older files stored in the NewFeatureBranch are
> used instead (which is quite abnormal, svn should take care of revision, do
> it?)
>
> I'm sure i'm missing something or doing something the wrong way, if somebody
> can help will have my gratitude for ages!
Think of merge as a fancy version of create patch + apply patch. In a
lot of ways, that is what it is. Now, you make a bug fix in trunk at
r252 and you want to merge that to the branch. When you run the merge
command, the inputs are the values you need to create the patch, with
the output being applied to your working copy. In your case, you
would want a working copy checked out from your branch. The From and
To URL would both be trunk (as that is where the change occurred. The
From Revision would be 251 and the To Revision would be 252. In
Subclipse you can just use the chooser button to select the range of
revisions you want to merge and it will fill in the needed revision
values.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Oct 29 17:40:56 2007