Re: merge conlict?

[Teemu Likonen]

On 2010-01-25 12:27 (+0100), Óscar Fuentes wrote:

> OTOH, Mark looks like more
>
> somebranch $ bzr merge URL_TO_UPSTREAM_TRUNK
> somebranch $ bzr commit
> somebranch $ bzr push URL_TO_UPSTREAM_TRUNK
>
> which causes havoc.

Let's visualize:

    * 0bbf36b (vc-annotate-revision-at-line): Compare
    *   fe8377b * xfns.c (Fx_create_frame): If frame
    |\
    | *   9e63631 Merge from trunk
    | |\
    | |/
    |/|
    * | 7f598d9 (vc-bzr-print-log): Use the more comp
    * |   145ad3a merge
    |\ \
    | * | b1ecfe3 (vc-git-dir-status-goto-stage): Pas
    * | | ddf9279 working version of vc-bzr-revision-

    ^-- This line is the official branch (aka "trunk") after Mark's
        merge-commit-push.

Ok, moving further back in time. The merge in question is the asterisk
below:

    * | |   b8de0d6 merge conflict
    |\ \ \
    | |/ /
    | * |   49a939e Try and fix bug#788, hopefully fo
    | |\ \
    | | * | 85738d0 * keymap.c (shadow_lookup): Add `
    | * | | e0b7353 Use png_sig_cmp to allow linking
    | * | | cabf561 Remove support for adding --signo
    | * | | 2e23485 (xterm-maybe-set-dark-background-

    ^ ^- This is the official branch (aka "trunk").
     \
       This is Mark's personal branch.

Well, technically nothing bad has happened. It's a social question if
it's important to always have the trunk the first parent.