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

Re: Merge tracking and automated merges

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-17 18:50:44 CEST

Matt Doran wrote:
>
> Stefan Küng wrote:
>> you used
>> $ cd /branches/mybranch
>> $ svn merge -g
>>
>> to do the same with TSVN:
>> * right-click on /branches/mybranch
>> * choose "merge"
>> * 'from' url: url/of/trunk
>> 'to' url same as from url
>> from-revision: "WC"
>> to-revision: HEAD
>>
>>
>>
> Is this what you mean, literally typing in "WC"? Screenshot:
> http://img85.imageshack.us/img85/6738/mergeky8.png
> <http://img85.imageshack.us/my.php?image=mergeky8.png>
>
> If I do that I get an error:
> http://img90.imageshack.us/img90/8906/errortk3.png
>
> I don't really understand it anyway ... I'm drafting another email about
> this.

Sorry, that won't work.
We really need a separate command for this:
http://issues.tortoisesvn.net/index.php?do=details&task_id=406

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Oct 17 18:51:05 2007

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