Wrong merge of single line

Hi,

I merged one revision from branch to trunk. The merged revision has only one
file changed - new line was added. The result of merge was reliably wrong, the
added line seems to be placed randomly into a code where it doesn't belong. I
don't know what data may help with this problem.

Here is the change from branch:

@@ -1190,6 +1190,7 @@
       SimplePDJD pdjd = getEB( pdjdId, appCtx.getDatabaseId() );
       pdjdVO = pdjd.getSimplePDJDVO( G2Const.LANGUAGE_CZ_ID );
       pdjdVO.simplePdjdG2id = pdjdId; // hot fix
+ pdjdVO.$secDomainG2id = pdjd.getSecDomainG2Id();
     }
     catch(Exception ex)
     {

And the result in trunk:

Index: EJB/G2BCore/ch/ips/g2/b/core/adp/SimplePDJDAdp.java
===================================================================
@@ -1252,6 +1252,7 @@
      SimplePDJDVO result = getDao().singleFindByVO(criterion, true);
 
      return result;
+ pdjdVO.$secDomainG2id = pdjd.getSecDomainG2Id();
     }
     else
     {

The line before and after the change are not same. I expected that merge result
should be conflict. Is this somehow related to merge tracking info?

Tested on SVN 1.5.4 and also on TSVN 1.5.5.

Thanks for your time, Jan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-10 14:43:04 CET