Re: Merge in revno 100770

[Bojan Nikolic]

Andreas Schwab <address@hidden> writes:

> Eli Zaretskii <address@hidden> writes:
>
>> Do we know how could that happen?
>
> It looks like a wrong conflict resolution.  You can see the actual
> conflicts with
>
>   git show 036075de6587c79f9b609a68ddf4be09bd3a05ef src/fringe.c
>

Maybe there is a better way, but you can replay this situation in bzr by
itself with the following sequence of commands:

# Check-out of tree as it was just before the problematic merge. I
# assume in current working directory, the directory "trunk" contains
# the emacs trunk branch. If not replace "trunk/" by for example
# lp:emacs

bzr co -r 100769 trunk/ merge-problem-explain

# Replay the merge
cd merge-problem-explain
bzr merge  -r 99634.2.281 ../trunk/

..... other output............
Text conflict in src/fringe.c
....  other output ..........

If you look at the conflict t is easy to see how it can have been
resolved incorrectly. 

A suggestion related to this:

I would recommend running merge with the "--show-base" option (if this
isn't what you do anyway). In this the conflict would have been
displayed as:

,----
| <<<<<<< TREE
|       left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p);
|       else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))
|              || (row->reversed_p && row->continued_p))
| ||||||| BASE-REVISION
|       left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p);
|       else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
| =======
|       {
|         left = LEFT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p);
|         if (bot_ind_max_y >= 0)
|           left_offset = bot_ind_max_y - (row->y + row->visible_height);
|       }
|       else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
| >>>>>>> MERGE-SOURCE
`----

making it rather easier to understand the conflict.

Best,
Bojan


-- 
Bojan Nikolic          ||          http://www.bnikolic.co.uk