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

RE: Getting new files from trunk to branch.

From: James FitzGibbon <jfitzgibbon_at_primustel.ca>
Date: 2005-03-14 23:51:27 CET

It's the same operation.

Merge from the revision at which the branch was copied from the trunk to the
head rev.

So if you've got this type of structure

branches/
        /mybranch
trunk/

And you branched at rev X, the command is

cd branches/mybranch
svn merge -rX:HEAD ../trunk .

HTH

-----Original Message-----
From: Flemming Gram Christensen [mailto:fgc@mjolner.dk]
Sent: Monday, March 14, 2005 5:34 PM
To: users@subversion.tigris.org
Subject: Getting new files from trunk to branch.

Hi.
I am new to subversion.
I have created a repository.
I have Imported the files for a project the trunk.
I have created a branch using svn copy.
So far so good.

Now I have added some new files to the trunk edition of the project.
How do I get them (the new files) into my branch also?
The other way (branch to trunk) is also a common operation I guess.

Do I have to do a manually svn copy (which requires that I know the names of
all new files)?

I read chapter 1-4 in the book and the faq, but it mostly talks about
merging files which have been changed in the trunk or branch or both.

Regards
Flemming

Flemming Gram Christensen, M.Sc., Software Engineer, Mj°lner Informatics
------------------------------------------------------------------------
Mjolner Informatics A/S Phone: +45 70 27 43 43
Helsingforsgade 27 Fax: +45 70 27 43 44
DK-8200 Aarhus N, Denmark E-mail: fgc@mjolner.dk
------------------------------------------------------------------------
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

--
No virus found in this incoming message.
Checked by AVG Anti-Virus.
Version: 7.0.308 / Virus Database: 266.7.2 - Release Date: 3/11/2005
 
-- 
No virus found in this outgoing message.
Checked by AVG Anti-Virus.
Version: 7.0.308 / Virus Database: 266.7.2 - Release Date: 3/11/2005
 
-- 
----------------------------------------------------------------------------
This electronic message contains information from Primus Telecommunications
Canada Inc. ("PRIMUS") , which may be legally privileged and confidential.
The information is intended to be for the use of the individual(s) or entity
named above. If you are not the intended recipient, be aware that any
disclosure, copying, distribution or use of the contents of this information
is prohibited. If you have received this electronic message in error, please
notify us by telephone or e-mail (to the number or address above)
immediately. Any views, opinions or advice expressed in this electronic
message are not necessarily the views, opinions or advice of PRIMUS.
It is the responsibility of the recipient to ensure that
any attachments are virus free and PRIMUS bears no responsibility
for any loss or damage arising in any way from the use
thereof.The term "PRIMUS" includes its affiliates.
----------------------------------------------------------------------------
Pour la version en franšais de ce message, veuillez voir
 http://www.primustel.ca/fr/legal/cs.htm
----------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 14 23:55:52 2005

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