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

Re: [TSVN] Merge Questions

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-08-13 17:52:01 CEST

Brad Rhoads wrote:

> One more question. . .
>
> If after I merge and commit trunk, creating rev N, what From Rev do I use
> next time I merge, N or N + 1?
>
> For example,
>
> Rev 11 is the HEAD of mybranch
> Merge and commit trunk, creating Rev 12
> Do other stuff in mybranch
>
> If I want to merge again, should my From Rev be 11 or 12?

Think about it:
You want then to merge all changes you made after that commit. So you
must specify the revision 12. If you then merge from rev 12 to HEAD, you
will merge all changes made from rev 12 on. The changes you made in
revision 12 must not be merged again (you already did that).

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 18:59:21 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.