TortoiseSVN manual

[Lübbe Onken]

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-***@tortoisesvn.tigris.org].

[Stefan Küng]

Post by Lübbe Onken
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.

I'll try to come up with a better description. You're right, as it is
now it's very confusing...

Stefan
--
___
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=3074734

To unsubscribe from this discussion, e-mail: [dev-***@tortoisesvn.tigris.org].

[Lübbe Onken]

Hi Stefan,

Post by Stefan Küng
I'll try to come up with a better description. You're right, as it is
now it's very confusing...

Much better, thank you.


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=3074812

To unsubscribe from this discussion, e-mail: [dev-***@tortoisesvn.tigris.org].