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

Re: [tortoisesvn] r20079 committed - Commiting changes from r20075 in right way

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Thu, 2 Sep 2010 12:45:45 +0100

2010/9/2 <tortoisesvn_at_googlecode.com>:
> Revision: 20079
> Author: lokator
> Date: Thu Sep  2 04:35:48 2010
> Log: Commiting changes from r20075 in right way
> http://code.google.com/p/tortoisesvn/source/detail?r=20079
>
> Modified:
>  /trunk/doc/po/TortoiseSVN_sk.po
>  /trunk/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml

<snip>

> =======================================
> --- /trunk/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml    Thu Sep  2
> 04:03:35 2010
> +++ /trunk/doc/source/en/TortoiseMerge/tme_dug_conflicts.xml    Thu Sep  2
> 04:35:48 2010
> @@ -13,7 +13,7 @@
>         <action>right-click</action> on the changed lines and select
>         <menuchoice>
>             <guimenu>Context Menu</guimenu>
> -            <guimenuitem>Use text block from <quote>theirs</quote>
> +            <guimenuitem>Use text block from 'theirs'
>             </guimenuitem>
>         </menuchoice>.
>         Then the changes from the left file are added to the right file.

<snap>

Why are you making changes to the xml markup. Please don't do that
without first discussing it on the list.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2654571
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 13:45:53 CEST

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