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

Re: How to merge branch back to trunk when branch is in sync with trunk

From: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2004-11-01 22:14:04 CET

On Nov 1, 2004, at 3:50 PM, Peter Valdemar Mørch wrote:

> haller-at-ableton.com (Stefan Haller) |Lists| wrote:
>> It is really not so hard to
>> keep track of what you merged, if you work carefully.
>
> I like to wear belts and suspenders.
>
> "Trust is good, control is better" - Lenin
>
> Ah, well, I guess we've pretty much beaten this horse to death now,
> huh? :-D

But it was helpful, thanks :)

Coming from VSS where merging is just horribly broken I was a little
unsure of the best way to do it with subversion.

For example, I wasn't even sure if it was correct o merge from trunk
-r123:145 and then a bit later -r145:167. I was thinking "Does this
merge the changes for -r145 twice?" I assume not because the diff is
*between* the specified versions.

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 1 22:14:53 2004

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