On Fri, Jan 20, 2012 at 11:34 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> 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.
>
This happens for me in a brand new working copy containing no local
modifications. I verified this on three computers.
I tried in a working copy of a different project's trunk in the same
repository and do not have the problem, so apparently there is
something about the changes on this specific branch that cause the
problem to occur.
I also tried updating my working copy to the previous revision
(HEAD-1) and then doing the compare with any revisions before it and
that works fine.
My latest revision is a merge from a branch that modified 2 files and
svn:mergeinfo. Is it possible this problem only occurs when the diff
involves merge info?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2910225
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-20 20:50:15 CET