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

Re: vendor tracking from external repository possible?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 18 Apr 2008 21:40:24 +0200

Roland Schwarz wrote:
> I discovered that it is possible to merge from
> an unrelated url into my working copy.
>
> e.g. my working copy is at repository url
> https://myserver.top/svn/project/vendor/current
>
> Now I use tree merge started on this WC with urls:
> from http://coolaps.org/svn/cool/tags/1.34.0 HEAD
> to http://coolaps.org/svn/cool/tags/1.35.0 HEAD
>
> and select "ingnore ancestry".
>
> This merges into my repository, which I can commit afterwards.
>
> I have been told this is not possible with cmd-line
> svn. Is this an extension in the tortoise client (1.5) ?

No, you can also do the same with the command line client.

> Are there any pitfalls I should know before trying to use
> this for vendor tracking?

Yes: if the repository is hosted on an svn 1.5 server which knows about
merge tracking, and the client also is >= 1.5, then your working copy
will get a lot of merge tracking properties with wrong revisions (the
ones from the foreign repository).
You should remove those properties before you commit that merge.

Stefan

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

Received on 2008-04-18 21:40:37 CEST

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