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

Re: Applying patches: Changed lines in right pane

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 11 Aug 2009 08:42:37 +0200

On 11.08.2009 06:42, André Hänsel wrote:
> Hi list,
> when I am applying a patch I understand that when the patch requests a line
> change, this appears in the left pane as a combination of a minus-line and a
> plus-line.
> But what do marked lines in the right pane mean?
> In the screenshot there is a change around line 396 but there is nothing in
> the patch that says anything about line 396ff.

Since TMerge shows you the three-pane view, your patch doesn't apply
cleanly to your working copy. TMerge automatically fetches the file from
the repository for which the patch was created for.

For example:
* wc is at r100
* user makes modifications
* create the patchfile
* wc is already at r120
* apply patchfile : not cleanly possible
* TMerge fetches affected file(s) from repository for r100 (the revision
the patch was created for)
* TMerge shows three-way diff for r100, r120 and your wc

That's why you see modifications in the "mine" view: these are the
modifications done between r100 and r120 (in the example above, your
revisions will vary).


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-11 08:43:13 CEST

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

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