Conflict merging using ancestry

I am new to SmartSVN, and it looks to me like it is not correctly
using ancestry when merging conflicts.

1) When two programmers added different variables on the same line,
SmartSVN correctly identifies it as a conflict, but only allows the
acceptance of one line or the other. When compared to ancestry, it
should be clear that both lines are new, and thus the user should at
least have the option of accepting both.

In the two other merge tools I tried (TeamWare filemerge and kdiff3)
this worked as I would expect.

2) When choosing to use an external conflict solver, there doesn't
appear to be a way to pass the ancestor file (e.g. test.cc.r12) in
addition to the left file (e.g. test.cc.mine) and the right file
(e.g. test.cc.11). The other tools I would use, (filemerge of kdiff3)
NEED this file in order to simplify the merging process.

Am I missing something here? Or is this a feature that still needs to
be added?

Thanks!
Marty

Messages in this topic (1) Reply (via web post) | Start a new topic

.

Hello Marty,

> 1) When two programmers added different variables on the same line,
> SmartSVN correctly identifies it as a conflict, but only allows the
> acceptance of one line or the other.

There is no special action to accept both changes currently, but you may
simply delete the conflict markers to archive the desired result.

> 2) When choosing to use an external conflict solver, there doesn't
> appear to be a way to pass the ancestor file (e.g. test.cc.r12)

That's currently no possible. We will add a corresponding parameter for
version 4.

--
Best regards,
Marc Strapetz
_____________
SyntEvo GmbH
www.syntevo.com

&quot;kchoose2" < mschettler%40scitor.com">mschettlerscitor.com> wrote:

> I am new to SmartSVN, and it looks to me like it is not correctly
> using ancestry when merging conflicts.
>
> 1) When two programmers added different variables on the same line,
> SmartSVN correctly identifies it as a conflict, but only allows the
> acceptance of one line or the other. When compared to ancestry, it
> should be clear that both lines are new, and thus the user should at
> least have the option of accepting both.
&gt;
> In the two other merge tools I tried (TeamWare filemerge and kdiff3)
> this worked as I would expect.
>
> 2) When choosing to use an external conflict solver, there doesn't
> appear to be a way to pass the ancestor file (e.g. test.cc.r12) in
> addition to the left file (e.g. test.cc.mine) and the right file
> (e.g. test.cc.11). The other tools I would use, (filemerge of kdiff3)
> NEED this file in order to simplify the merging process.
>
> Am I missing something here? Or is this a feature that still needs to
> be added?
&gt;
> Thanks!
> Marty
&gt;
>
>
>
> Yahoo! Groups Links
&gt;
>
>
>
>

Messages in this topic (2) Reply (via web post) | Start a new topic

.