pobox@verysmall.org wrote:
> Mark Phippard wrote:
>> svnmerge would likely have problems if you did some merges in
>> Subclipse as the merge tracking properties would not be updated..
>> You'd have to remember to tell svnmerge what you did.
>
> Hm... that sounds bad and renders svnmerge in this case useless.
I didn't really see this as being problematic. I assume you intend to
use svnmerge for all your merges. You could still use Subclipse for
everything else, I am just saying that if you did a merge using
Subclipse then the svnmerge tracking properties would not have been
populated. It doesn't mean you cannot do commit/update etc.
>> I do merges all the time with Subclipse and do not really see why
>> people need something like svnmerge. "So there!".
>>
>> I think merging in Subversion is incredibly easy. Some people find
>> it difficult. I have watched what svnmerge does and what SVN is doing
>> themselves with merge tracking. I think it makes some aspects of the
>> merge a little easier, but I personally do not experience the
>> problems that those solutions are trying to solve.
>
> I did not want to start a fight or so. I love Eclipse/Subclipse - but
> how do you merge in Subclipse 'again and again'? My problem is that we
> have very active communication between the trunk and a branch
> (basically for us the trunk is the 'risky' development and the branch
> is the 'non-risky development' - but both are changed all the time and
> updates fly back and forth).
I was just joking, no fight. I have two types of branches I generally
maintain. I have release branches, where no development occurs. Fixes
are made in trunk and cherry-pick merged to the branch. This does not
really require much effort as you usually no which revisions you want to
merge from trunk.
I then have some customization branches. These have different
variations to the code on trunk and just need to be kept in synch with
trunk. svnmerge would make this easier, but I do not find the manual
process that difficult. I just record in my commit the revisions I
merged, and the next time I need to do it, I just find that message,
which contains the last revisions I merged, and then merge the ones
since then.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Nov 23 19:19:32 2006