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

Re: Merge all revisions from trunk to branch

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: Thu, 8 Dec 2016 13:00:07 +1300

On 7/12/2016 23:41, Petat, Daniel wrote:
> I am working in a branch of a repository. There I commit some changes,
> e.g. Revision 10.
> Then I merge this revision into the trunk, which creates revision 11.
> After that, another user commits something into the trunk, creating
> revision 12.
> Now I want to merge this revision back into my branch.

Here's the problem. After you merge a branch into trunk, you should
delete the branch.

If you want to continue, then create a new branch after deleting the old
one. (Generally you shouldn't be doing this though -- these sorts of
branches are "feature branches" or "topic branches" and should be
ephemeral and not need re-creation.)

(There is a way to "repair" a merged branch so that it can be worked on
without deleting it, but it's not recommended.)

Alternately, you shouldn't be working on a branch at all if you're
wanting to frequently merge back to trunk -- just work directly on
trunk, update frequently, and only commit when you're ready to "merge".
SVN is not like Git; branches are significant and appear in the history.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-12-08 01:00:27 CET

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