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

Re: [Bug report] Rejected patch hunks when performing a diff

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 20 Jan 2012 18:34:28 +0100

On 20.01.2012 17:02, Justin Johnson wrote:
> Hello,
>
> I am using TortoiseSVN 1.7.4, Build 22459 - 32 Bit on Windows XP SP3.
>
> I checked out a working copy of trunk for a specific project, right
> clicked and selected TortoiseSVN> Show Log. Then I right click on
> any revision other than the latest and select Compare with working
> copy. TortoiseMerge appears with a File patches window showing the
> modified files. If there is one file in the File patches dialog, if I
> double click on it a dialog with the title "Rejected patch hunks for
> 'filename' - TortoiseUDiff" appears. The contents of this window are
> 3 lines similar to the following.
>
> 1 --- C:/Work/path/to/file.txt
> 2 +++ C:/Work/path/to/file.txt
> 3
>
> If the revision I select has multiple files, I always get the error
> above when I double click on the last file in the list.
>
> I assume this is a bug. Can anyone confirm?

Doesn't happen for me.
Only if I have the file locally modified, then sometimes I get that
"rejected patch hunks", but that's expected in case of local mods.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2910211
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-20 18:34:36 CET

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.