[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: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Thu, 9 Apr 2009 22:18:50 +0200


2009/4/9 halfer <nabble.forums.ws_at_jondh.me.uk>:
> Hi all, new poster here. (Let me start by apologising if you've seen this
> question before; I have had a good search for branching/merging info, but
> not found a great deal relating specifically to TSVN. Perhaps I need to
> sharpen my google skills!).
> 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.

  @@  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-10 08:00:21 CEST

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