You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Christoph Bartoschek <ba...@or.uni-bonn.de> on 2010/02/10 12:59:17 UTC

Problems during merge

Hi, 

after a merge with conflicts I completely wrong conflict markers:


======================= inv_merge.C =============================
...
   } else {
<<<<<<< .working
=======
      _cur.sinks(to_polarity(other)).append(csol.sinks());
>>>>>>> .merge-right.r13821

      _cur.sinks(to_polarity(other)).append(csol.sinks());

      Time slew_limit =
...
==================================================================

In my working copy there is:

======================= inv_merge.C.working ======================
...
   } else {

      _cur.sinks(to_polarity(other)).append(csol.sinks());

      Time slew_limit =
...
==================================================================

The right part only differs in an empty line:

=============== inv_merge.C.merge-right.r13821 ===================
...
   } else {
      _cur.sinks(to_polarity(other)).append(csol.sinks());

      Time slew_limit =
...
==================================================================

In the left part we have: 

=============== inv_merge.C.merge-left.r13820 ===================
...
   } else {
      _cur.sinks(to_polarity(other)).append_slice(csol.sinks().begin(),
                                                  csol.sinks().size());

      TimePair slew_limit =
...
==================================================================


I would have expected that I see the code of the left part in the merge view 
and not two times the code from working.

What is going wrong here?

Christoph

Re: Problems during merge

Posted by Neels J Hofmeyr <ne...@elego.de>.
Hi Christoph,

it would be nice if you could provide a way to reproduce this issue. I am
aware that this can be some work, and we would highly appreciate it. :)

I too have seen some weird conflict markings and it would be nice to get a
handle on them. But we need to be able to reproduce them before we can do
that :(

I'm attaching a test script template for unix shells which creates a clean
repository and working copy for you to run svn commands in. "Simply" append
your commands after the comment that says "ACTUAL TEST".

e.g. append lines like:

 svn mkdir trunk
 echo 'this is file foo' > trunk/foo
 svn add trunk/foo

 svn commit -m "revision 1"

etc.
(Assuming that you are on a unix-like box, or that you are using cygwin)

Thanks,
~Neels


Christoph Bartoschek wrote:
> Hi, 
> 
> after a merge with conflicts I completely wrong conflict markers:
> 
> 
> ======================= inv_merge.C =============================
> ...
>    } else {
> <<<<<<< .working
> =======
>       _cur.sinks(to_polarity(other)).append(csol.sinks());
>>>>>>>> .merge-right.r13821
> 
>       _cur.sinks(to_polarity(other)).append(csol.sinks());
> 
>       Time slew_limit =
> ...
> ==================================================================
> 
> In my working copy there is:
> 
> ======================= inv_merge.C.working ======================
> ...
>    } else {
> 
>       _cur.sinks(to_polarity(other)).append(csol.sinks());
> 
>       Time slew_limit =
> ...
> ==================================================================
> 
> The right part only differs in an empty line:
> 
> =============== inv_merge.C.merge-right.r13821 ===================
> ...
>    } else {
>       _cur.sinks(to_polarity(other)).append(csol.sinks());
> 
>       Time slew_limit =
> ...
> ==================================================================
> 
> In the left part we have: 
> 
> =============== inv_merge.C.merge-left.r13820 ===================
> ...
>    } else {
>       _cur.sinks(to_polarity(other)).append_slice(csol.sinks().begin(),
>                                                   csol.sinks().size());
> 
>       TimePair slew_limit =
> ...
> ==================================================================
> 
> 
> I would have expected that I see the code of the left part in the merge view 
> and not two times the code from working.
> 
> What is going wrong here?
> 
> Christoph