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 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).
Would you mind posting a hint?
Thanks,
Iv
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Thu Nov 23 18:55:38 2006