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

Re: May I merge in the same path in trunk or branch?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 27 Aug 2008 17:56:04 +0200

Edwin wrote:
> I had many changes in my trunk, my svn structure likes below,
> trunk/JP/images
> trunk/JP/code
> trunk/US/images
> Someone add new files in trunk/JP/code, changes files in trunk/JP/
> images
> I would like to sync the changes to trunk/US/images
> I use Merge function but it skips trunk/JP/code change, show warning
> said because trunk/US/images not exists

But it does exist according to your structure above?
Are you sure you entered the data in the merge dialog fields correctly?

> Is there other ways to achieve my requirement? Besides I copy those
> change files to those directories by hand?
> May I export change files and path to patch file using Tortoiese SVN,
> or only changed files include patch info? Thanks for ur kindly help.

The 'create patch' feature only works for text files. Binary files are
excluded in the patchfiles.

But you can:
* use the repository browser, go to the new files, right click on them,
then choose "copy to wc" from the context menu
* copy the files by hand (but you'll loose the history)
* show log on /trunk/JP, select the revisions which you want to merge,
right-click, choose "merge to..." from the context menu, then select
your working copy folder of /trunk/US

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-08-27 17:56:24 CEST

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