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

[Subclipse-users] Another general subclipse question

From: etornick <etornick_at_comcast.net>
Date: 2006-02-17 15:26:34 CET

The replies I got for my other question were awesome. It was a question about
how to disable certain functions in the repository view. Editing the
plugin.xml was really cool.

This question is more fundamental and perhaps more obvious to most. I am
trying to get a good understanding of the merge process using subclipse.
Perhaps coming from the cvs world is making this more difficult for me.

I have been experimenting with a project I have in the trunk. I created a
branch for this project and wanted to be sure I understood how to do
periodic merges from the branch to the head ( I know the same would apply
for going the other way)

My confusion lies in the way in which to pick the range of revisions to do
the merge. If I pick them incorrectly the merge doesn't do anything, then
when I pick the right ones the merge goes great.

For example. Lets say that I am merging from the branch into the head. And
let's say that edits have occured in both the head and the branch since the
last time I merged.

I checkout a working copy of the head (a new working copy). The first
problem I have is understanding what url to use for the start revision. Do I
use the head or the branch. Then do I switch URL's to get the next revision?
The highest revision number may be in the head or the branch depending upon
where the last edit happened.

I know I am missing a fundamental concept (not the first time!) here. I
know that once I "get it" merging would probably be real easy to do.

I read about this in the subversion book but I am still confused. I do
understand that revision numbers are global and they just keep bumping up no
matter where you are... whether in a brach, the head or as part of a tag.

Thanks in advance for your insights...


View this message in context: http://www.nabble.com/Another-general-subclipse-question-t1140832.html#a2989500
Sent from the subclipse - users forum at Nabble.com.
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Feb 17 15:30:05 2006

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.