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

Re: Merge doesn't Add files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 13 Oct 2009 19:11:37 +0200

On 13.10.2009 12:05, Nikola Smiljanic wrote:
> I am trying to merge a range of revisions from trunk to my branch, a
> file was added to trunk in one of these revisions. After the merge is
> complete the file is there (in my branch), but it's not added. I have
> to manually check for added files! Am I doing something wrong, is
> there a way around this?
>
> One more thing, if there is a revision in trunk that adds a file and
> one that changes it, I get a "skipped" message when merging these
> revisions. This is how I realised that something is wrong.

If you get a skipped message, that indicates that you're using an old
(1.5.x) version of TSVN. Please upgrade.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2407226
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-13 23:48:01 CEST

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