[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Help me unstick my bzr, please.
From: |
Stephen J. Turnbull |
Subject: |
Re: Help me unstick my bzr, please. |
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.
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. This would be disconcerting to
experienced bzr users.
- Help me unstick my bzr, please., Alan Mackenzie, 2010/01/15
- Re: Help me unstick my bzr, please., Giorgos Keramidas, 2010/01/15
- Re: Help me unstick my bzr, please., Eli Zaretskii, 2010/01/16
- Re: Help me unstick my bzr, please., Stephen J. Turnbull, 2010/01/16
- Re: Help me unstick my bzr, please.,
Stephen J. Turnbull <=
- Re: Help me unstick my bzr, please., Eli Zaretskii, 2010/01/16
- Re: Help me unstick my bzr, please., Stephen J. Turnbull, 2010/01/17
- Re: Help me unstick my bzr, please., Giorgos Keramidas, 2010/01/16
- Re: Help me unstick my bzr, please., Eli Zaretskii, 2010/01/16
- Re: Help me unstick my bzr, please., Giorgos Keramidas, 2010/01/16
- Re: Help me unstick my bzr, please., Lennart Borgman, 2010/01/16
- Re: Help me unstick my bzr, please., Andreas Schwab, 2010/01/16
- Re: Help me unstick my bzr, please., Eli Zaretskii, 2010/01/16
- Re: Help me unstick my bzr, please., Giorgos Keramidas, 2010/01/16
- Re: Help me unstick my bzr, please., Lennart Borgman, 2010/01/16