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

TortoiseSVN manual

From: Lübbe Onken <luebbe.tortoisesvn_at_gmail.com>
Date: Mon, 17 Mar 2014 08:42:35 +0100

Hi Folks,

could someone please review the documentation on the new "block changes"
function in TortoiseMerge. I tried to understand it while translating and I
couldn't.

---SNIP---
If you use TortoiseMerge to edit the file, you can either edit the changes
as you're used to, or mark all the changes that you want to include.
<action>right click</action> on a modified block and use
<menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Mark this
change</guimenuitem></menuchoice> to include that change. Finally
<action>right click</action> and use <menuchoice><guimenu>Context
Menu</guimenu><guimenuitem>Leave only marked
changes</guimenuitem></menuchoice> which will invert your changes (unmarked
changes) that you don't want to appear in the current commit.
---SNIP---

The first phrase is ok, but the second one is confusing. What is marked?
What is inverted? What is kept in the file?
We are talking about TortoiseMerge and file changes right now aren't we? So
why does the word "commit" appear already? AFAICT the commit dialog is
still "far" away.

Cheers
- Lübbe

--
Please help me get more space on Dropbox :)
https://www.dropbox.com/referrals/NTIwMzcxNjI5
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074707
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-17 08:42:44 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.