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

Re: Beginner question on merging trunk to branch

From: halfer <nabble.forums.ws_at_jondh.me.uk>
Date: Tue, 14 Apr 2009 01:56:24 -0700 (PDT)

Jean-Marc van Leerdam wrote:
> 2009/4/9 halfer <nabble.forums.ws_at_jondh.me.uk>:
>> Briefly, I have set up a test repo, which myself and colleagues have each
>> checked out. We've each made some changes, and committed them using TSVN.
>> I've merged each of these changes (with minor issues, which may be the
>> subject of a later question) into the trunk. For myself and two
>> colleagues I
>> merged and committed individually, so there were three commits to the
>> trunk.
>> This means that for each user, their w/c is missing two changesets. I am
>> rather hoping that we don't need to worry about revision numbers, since
>> each
>> of us just want to "be brought up-to-date" with all changes in the trunk.
> No, no no, before committing you should run an update on your working
> copy. That brings in the changes made by others.
> Merging is only needed if you've made a change to one set of files and
> want to apply that same change to another set of files. Like you've
> modified the trunk and now want that change also on a branch. Or the
> other way around.

Many thanks for your reply. I do apologise; reading my original question, I
seem to have omitted the critical detail that my colleagues and I are using
separate (personal) branches. This arrangement was intended to protect each
other against poor-quality changes that break the build. As far as I
understand it, if each of us does an update this will only retrieve our own
changes, which are in our personal working copies anyway.

For the avoidance of doubt, (a) each personal branch initially was a copy of
the initial trunk, (b) each branch was checked out by its owner, and changes
committed to it, (c) changes in each branch were merged to the trunk, and
(d) I attempted to merge changes to the trunk to each personal branch, and
tree conflicts resulted.

One of us (me) is the "committer" who has responsibility for checking the
quality of changes, and is charged with merging personal contributions into
the trunk (or rejecting them if they do not pass muster). However, as above,
I am struggling to do this in a clean way.

Could this branch and merge approach be done in a better way, do you think?
Or if this arrangement is quite usual, after merging changes from branch to
trunk, do I also have to merge changes from trunk to branch, so all changes
propagate to all users? How can I do this cleanly to avoid tree conflicts?

Thank you in advance.

View this message in context: http://www.nabble.com/Beginner-question-on-merging-trunk-to-branch-tp22976033p23035689.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-14 10:57:53 CEST

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