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

RE: Re: Re: Unexpected successful merge in a conflict

From: Arunmozhi <arunmozhi_v_at_yahoo.com>
Date: Thu, 26 Jul 2012 07:57:00 -0700 (PDT)

You are absolutely in the same thought as me. The definition of how close differs across tools. diff3 has chosen 2 lines and beyond compare has chosen 1. The problem is that the SVN has chosen 0.

Why I flag this as an issue because, the tool should not fail if we merge the same patch multiple times. Hope you can appreciate that this is a branch integration issue. Same change taken to two different branches comes back to the main branch twice.

The problem I faced is in a different scenario. We maintain many patches for a software. Each patch corresponds to a feature. And more than 2 patches can have the same code changes (corresponding to sub-features). When I try to merge all the patches to the software, the result is successful, but there are duplicated lines.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-26 16:57:03 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.