[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Help me unstick my bzr, please.
From: |
Eli Zaretskii |
Subject: |
Re: Help me unstick my bzr, please. |
Date: |
Sat, 16 Jan 2010 11:57:03 +0200 |
> From: Giorgos Keramidas <address@hidden>
> Cc: address@hidden, address@hidden
> Date: Sat, 16 Jan 2010 11:02:04 +0200
>
> > Why not simply
> >
> > ~/emacs/emacs.bzr/quickfixes$ bzr merge --force
>
> To be honest, because I don't know for sure what merge --force does
> under the hood.
>
> It sounds like it will solve the immediate problem of having a
> quickfixes branch half-way through a merge, but it also seems it will
> create a merge commit that includes both the pending merge changes *and*
> the small fix in the same changes.
Except for "bzr bisect", who else will be bothered by this?
- 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, 2010/01/16
- 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 <=
- 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
- Re: Help me unstick my bzr, please., Eli Zaretskii, 2010/01/16
- Simple unsticking with 'bzr shelve' [was: Help me unstick ...], Stephen J. Turnbull, 2010/01/17
- Re: Help me unstick my bzr, please., Stefan Monnier, 2010/01/16
Re: Help me unstick my bzr, please., Alan Mackenzie, 2010/01/16