[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Help me unstick my bzr, please.
From: |
Giorgos Keramidas |
Subject: |
Re: Help me unstick my bzr, please. |
Date: |
Sat, 16 Jan 2010 11:59:19 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (berkeley-unix) |
On Sat, 16 Jan 2010 11:54:41 +0200, Eli Zaretskii <address@hidden> wrote:
>> From: Lennart Borgman <address@hidden>
>> I do not understand. Can someone please explain to me why a bazaar
>> user have to take care of this?
>
> It's in the workflow described on the wiki: the process of merging a
> branch with the mainline involves two commands:
>
> bzr merge
> bzr commit
>
> The first one merges the text of the files, but does not combine their
> histories. The second command finishes the merging process by
> updating the history so that it now includes both local commits and
> whatever happened in the mainline since the last time you merged from
> it.
Exactly. This is not a 'problem' of bazaar, FWIW. I's just the way
things work in all DVCS when you have committed local changes in a
non-bound branch.
Thank you Eli for writing up a very detailed explanation :-)
- Re: Help me unstick my bzr, please., (continued)
- 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, 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 <=
- 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
Re: Help me unstick my bzr, please., Eli Zaretskii, 2010/01/16