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

Re: [Subclipse-users] Subclipse and svnmerge

From: <pobox_at_verysmall.org>
Date: 2006-11-23 19:30:31 CET

Mark Phippard wrote:
> 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.

OK So basically you do it the 'normal' way.

What about this approach -

If I use the Compare function I discover the differences. Then I click
on the files one by one and do the 'copy right to left' think. Then I
commit.

This is not a real 'merge' - it is like manually typing the same thing
into the other branch. But it results in what we need - HEAD of both
branches (or branch and trunk) is in sync.

Is this very illegal and does it hide dangers?

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 19:30:39 2006

This is an archived mail posted to the Subclipse Users mailing list.