Re: Help me unstick my bzr, please.

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Cc: Giorgos Keramidas <address@hidden>,
>     address@hidden,
>     address@hidden
> Date: Sat, 16 Jan 2010 17:41:10 +0900
> 
> Eli Zaretskii writes:
> 
>  > Why not simply
>  > 
>  >   ~/emacs/emacs.bzr/quickfixes$ bzr merge --force
> 
> Because Alan's commit will be a merge commit, not a regular commit.
> This probably won't confuse most humans, who will be looking at Alan's
> commit message, not at the parentage of the commit, but it might cause
> issues with DAG tracing tools like bisect.

For such a small change, I doubt if this is significant.

> It will also very likely cause Alan's commit to appear to be the
> mainline, and all of the commits he has merged to be a feature branch,
> in the logs and GUI DAG viewers.

Sorry, I don't understand what you mean by ``appear to be mainline''
and by ``commits [...] to be a feature branch''.  Can you elaborate?