PrestoSoft Community

for purchasing?

Our problem is merging changes between branches of source code where one (or more) of the branches was refactored with huge number of renames

Thank you, this is very interesting way.

But it has a problem, it ignores specified substrings in any occurrence that could result in missing real changes what is not desirable.

However, as fast solution it helps a lot.

Do you know if there is a way to implement desired behaviour exactly (using ...

If you turn ON the option "Parts matching regular expression", and insert there
CODE: SELECT ALL
(ReqNewOrder)|(CreateOrderReq)
you will get first line identical, and second line different (from totally two lines in each file). Is this what you wanted?

Another variant of the mentioned option ...

When you write that "lines are equal" and "lines are different", do you mean that they are equal and different according to what you want (thus confirming that you got the desired result), or you mean that they are equal and different opposite to what you want (in which case would be nice to know ...

Thank you for the answer, but the advised way cannot solve the problem.

Lets give an example:

differences left: ReqNewOrder, right: CreateOrderReq

left line : .... processReqNewOrder(ReqNewOrder *req, ...)
right line : .... processCreateOrderReq(CreateOrderReq *req, ...)
ExamDiffPro : lines ...

Hi all,

I have huge number of known differences what I'd like to ignore in comparision. These differences I can specify as pairs <substring for left panel> and <substring for right panel>.

Is it possible to feed these pairs to ExamDiffPro or may be there is another way to ignore them?

/Boris