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

Re: Merge inside the same trunk

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Wed, 27 Jan 2010 07:31:27 +0100

Hi Ryan,

2010/1/27 Ryan Sun <ryansun81_at_gmail.com>:
> I have a php project hosted on SVN, and it has several frontend template
> packages, say A and B, and they have the same structure,
> If I made some change on A and committed, can I merge the change from A to
> B  (different sub-folders under the same SVN project)?
> If so, how? if not, is there a better way to manager different tempalte
> packages? MANY THANKS

Yes, that can be done. Go to the B folder in your working copy and
select Merge...

Then as the merge source ('from'), select the A folder and supply the
revision(s) you want to have applied to the B folder.

You may want to select 'ignore ancestry' if the A and B folder do not
share a common history (B created as a copy from A in the past for

For more info, check the TSVN online help.

.       ___
.  @@  // \\      "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 2010-01-27 07:31:34 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.