[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: Fri, 29 Aug 2008 15:18:41 +0200

Edwin wrote:
>> * 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
>
> I did the same way,but if I add new folder and files in /trunk/JP
> if /trunk/US is not branch from /trunk/JP ,it will skipp new folder
> and files when merge.
> if /trunk/US is branch from /trunk/JP ,it will add new new folder and
> files when merge.
> is it correct?Thanks you~

I don't know if the new folder would be skipped in the first case. You
have to try yourself. But if the 'add' of that folder was done in the
revision range you specify for the merge, I'm pretty sure it won't get
skipped.

Stefan

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

Received on 2008-08-29 15:18:56 CEST

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