[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: <kfogel_at_collab.net>
Date: 2004-11-01 20:35:51 CET

Scott Palmer <scott.palmer@2connected.org> writes:
> 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.

It sounds like you already figured out the answer, but just in case:
you're right, it would not merge r145 twice.

---------------------------------------------------------------------
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:29:52 2004

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