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

RE: Re: Merge/Update from trunc

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 11 Nov 2010 10:54:29 -0500

> > I believe merge tracking (which, AIUI, works if your client and
> server
> > are at both least 1.5.x) does this already. Be aware that this
> uses
> > properties on the files and/or the containing folders, so make
> sure
> > you commit those too, or future merges will not behave well.
>
> If this functionality exist in TortoiseSVN, please tell me how to
> find it. Both server and client are the latest.

I suggest you read the chapters on Branching and Merging. It explains the merge tracking and how it works.

http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge

Basically, when you merge from one path to another svn will record that information in a property (place depends on what path your merge target is). So, the next time you merge it will check the recorded merge info and not merge the previously merged revisions again.

Although, I suggest you get up to 1.6.13... there have been many fixes to mergeinfo since 1.5.x.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2681055

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-11 16:54:40 CET

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