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

Re: Merge/Update from trunc

From: Dale McCoy <dalestan_at_gmail.com>
Date: Tue, 9 Nov 2010 10:00:14 -0500

> I have a request for a simpler way to update a branch from trunc.
>
> Today you have to look inside the log to find the revision you want
> to save from. Then you have to merge a range of revisions, setting
> first revision to the revision you found and the last to head.
>
> Why not just let TortoiseSVN keep track of the trunc revision number
> on any branch you start, and have a new Context Menu Item "Merge/Update
> from trunc..". This would make it a lot easier to make sure the branch
> is updated with trunc frequently, making reintegrate more painless.

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.

Dale McCoy

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

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

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