| revision numbers after branching [message #536104] |
Thu, 27 May 2010 01:17  |
Eclipse User |
|
|
|
Hi,
I had created a branch . Now when I see the resource history of the branch(via SVN repository view) , I see two revision numbers . Both revision numbers show the same comments I had given when I created the branch. Finally I will need to merge with trunk after few commits to the branch.
Thanks
|
|
|
|
| Re: revision numbers after branching [message #536797 is a reply to message #536429] |
Mon, 31 May 2010 01:43  |
| Eclipse User |
|
|
|
Hi,
Ok, I want to actually merge few of my changes from branch, back to the trunk. Both trunk and branch are upto date. From the trunk I right click the project root and select
Team->Merge. Then I select the url of the branch, Now in the the Start Revision area, I select the Revision radio button, and I click on the Select button. Now this shows me in the window four rows. Out of these four rows(1101,1100,1082,1081 ) two are recent commits, and other two revisions show the same event(when branch was created). So for example the last row shows revision1081 and second last rows shows revision 1082. These two rows have same data for columns->changes, author, comments. The Date column shows difference in seconds.
In another variation, If I right click on the branch (in SVN repository explorer) and select on "Show Resource History" I see the same view. So basically just after branch creation I should only see one Revision row and not two correct?. The whole point of this post was that I am not able to merge from branch to trunk so I just wanted to crosscheck this.
Thanks
[Updated on: Mon, 31 May 2010 01:46] by Moderator |
|
|
| Re: revision numbers after branching [message #537911 is a reply to message #536797] |
Fri, 04 June 2010 03:23 |
| Eclipse User |
|
|
|
Hello,
>So basically just after branch creation I should only see one Revision
> row and not two correct?.
Yes. I could guess that there was something wrong with SVN itself as you
say that you have even the same changes. Could you reproduce the problem
and if you can please provide steps to reproduce it?
> The whole point of this post was that I am not
able to merge from branch to trunk so I just wanted to crosscheck this.
As you have two equal revisions, then as merge start revision you need
to select next revision after them, e.g. in your case 1100.
> Hi,
>
> Ok, I want to actually merge few of my changes from branch, back to the
> trunk. Both trunk and branch are upto date. From the trunk I right click
> the project root and select
> Team->Merge. Then I select the url of the branch, Now in the the Start
> Revision area, I select the Revision radio button, and I click on the
> Select button. Now this shows me in the window four rows. Out of these
> four rows(1101,1100,1082,1081 ) two are recent commits, and other two
> revisions show the same event(when branch was created). So for example
> the last row shows revision1081 and second last rows shows revision
> 1082. These two rows have same data for columns->changes, author,
> comments. The Date column shows difference in seconds. In another
> variation, If I right click on the branch (in SVN repository explorer)
> and select on "Show Resource Resource History" I see the same view. So
> basically just after branch creation I should only see one Revision row
> and not two correct?. The whole point of this post was that I am not
> able to merge from branch to trunk so I just wanted to crosscheck this.
>
> Thanks
--
Best regards,
Igor Burilo
|
|
|
| Re: revision numbers after branching [message #540471 is a reply to message #536104] |
Wed, 16 June 2010 05:47 |
| Eclipse User |
|
|
|
Yes Thanks. I could merge . I was making a mistake of selecting the URL for branch when merging. In the branch URL the project folder path was not getting inluded. So when I just give the branch URL without project root folder, it does not merge(it skiped the merge though it new all source files). The same happens correctly when project root folder is included in the URL path.
For example
http://<ip>:port/folder/branches/branch1
did not work
But the following Branch URL works for merge.
http://<ip>:port/folder/branches/branch1/myproject
Also while merging there was a confusion about selecting the Start Revision number. I was selecting this revision number which was the branch creation Revision number.
|
|
|
Powered by
FUDForum. Page generated in 0.41378 seconds
Home