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

Re: TortoiseMerge missing conflicts

From: Oto BREZINA <otik_at_printflow.eu>
Date: Fri, 02 Sep 2011 13:57:31 +0200

On 2011-09-02 13:20, Bernhard wrote:
> Hi all,
>
> recently I've run into this really strange situtation: I merged a set of revisions and Tortoise reported conflicts. So I click "Edit conflicts" and no conflicts are shown. Great. After some research, I stumbled across that: http://osdir.com/ml/version-control.subversion.tortoisesvn.user/2007-07/msg00095.html
>
> So I check "Compare whitespaces" in TortoiseMerge's settings and voilá, there are the conflicts (see the attached screenshot). [SNIP]
>
> Question/Issue 2: Why does Tortoise show conflicts in lines 256 - 301?? Those lines aren't different. The only difference is in line 255!?
It is three-way merge I guess you changed that block (256-301) in both
file even with most lines same.
> Can anybody tell what's going wrong here? If it is helpful, I can also provide the files where tortoise stores the revisions.
It it always good idea to send minimal test files. You can learn
something, and help others to focus on real problem and its solution.
Also reporting version is helpful.
> Thanks
> Bernhard

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2834564

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-02 13:57:55 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.