I am comparing changes in the following file:
Original File:
Modified File:
Beyond Compare Result: 
Beyond Compare Required Alignment: (manual)

I have tried Standard alignment,Myers O(ND) alignment,Patience Diff alignment but unable to automatically come to above comparison.
How can i do so automatically?
thanks
Original File:
Code:
Using oCon As New SqlConnection oCon.ConnectionString = oModConst.Return_Connection_String(System.Configuration.ConfigurationManager.AppSettings("DBConString").ToString()) oCon.Open() If Val(fivedigitSLNo) = 0 Then If cust_info.APP_CODE.ToUpper.Trim = "S" Then qry = "SELECT * FROM UserInfo where keyInfo like '%" & KeyStart & Replace(cust_info.key.Trim, "'", "''") & KeyEnd & "%' and saral_slno>0 and test1_slno=0" ElseIf cust_info.APP_CODE.ToUpper.Trim = "T" Then qry = "SELECT * FROM UserInfo where keyInfo like '%" & KeyStart & Replace(cust_info.key.Trim, "'", "''") & KeyEnd & "%' and test1_slno<>0" End If ElseIf cust_info.APP_CODE.ToUpper.Trim = "test" And Val(fivetest1SLNo) < test_sl_Limit Then qry = "SELECT * FROM UserInfo where test_slno=" & fivetest1SLNo & " and test1_slno=0" ElseIf cust_info.APP_CODE.ToUpper.Trim = "test1" Then If Val(fivetest1SLNo) < test_sl_Limit Then qry = "SELECT * FROM UserInfo where test_slno=" & fivetest1SLNo & " and test1_slno<>0" Else qry = "SELECT * FROM UserInfo where test1_slno=" & fivetest1SLNo End If End If ocmd = New SqlCommand(qry, oCon) oData = ocmd.ExecuteReader() If oData.HasRows = True Then oData.Read()
Code:
Using oCon As New SqlConnection oCon.ConnectionString = oModConst.Return_Connection_String(System.Configuration.ConfigurationManager.AppSettings("DBConString").ToString()) oCon.Open() 'pka cr s 'If Val(fivedigitSLNo) = 0 Then ' If cust_info.APP_CODE.ToUpper.Trim = "test" Then ' qry = "SELECT * FROM UserInfo where HD_KeyInfo like '%" & KeyStart & Replace(cust_info.Hd_Key.Trim, "'", "''") & KeyEnd & "%' and test_slno>0 and tds_slno=0" ' ElseIf cust_info.APP_CODE.ToUpper.Trim = "TDS" Then ' qry = "SELECT * FROM UserInfo where HD_KeyInfo like '%" & KeyStart & Replace(cust_info.Hd_Key.Trim, "'", "''") & KeyEnd & "%' and tds_slno<>0" ' End If 'ElseIf cust_info.APP_CODE.ToUpper.Trim = "test" And Val(fivedigitSLNo) < test_sl_Limit Then ' qry = "SELECT * FROM UserInfo where test_slno=" & fivedigitSLNo & " and test1_slno=0" 'ElseIf cust_info.APP_CODE.ToUpper.Trim = "test1" Then ' If Val(fivetest1SLNo) < test_sl_Limit Then ' qry = "SELECT * FROM UserInfo where test_slno=" & fivetest1SLNo & " and test1_slno<>0" ' Else ' qry = "SELECT * FROM UserInfo where test1_slno=" & fivetest1SLNo ' End If 'End If If Val(commonslno) = 0 Then qry = "SELECT * FROM UserInfo where keyInfo like '%" & KeyStart & Replace(cust_info.key.Trim, "'", "''") & KeyEnd & "%' and product='" & cust_info.APP_CODE.Trim & "'" ocmd = New SqlCommand(qry, oCon) oData = ocmd.ExecuteReader() Else qry = "SELECT * FROM UserInfo where common_slno=" & commonslno & " and Product='" & cust_info.APP_CODE.Trim & "'" 'pka cr ocmd = New SqlCommand(qry, oCon) oData = ocmd.ExecuteReader() End If 'pka cr If oData.HasRows = True Then oData.Read()
Beyond Compare Required Alignment: (manual)
I have tried Standard alignment,Myers O(ND) alignment,Patience Diff alignment but unable to automatically come to above comparison.
How can i do so automatically?
thanks
Comment