[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Help me unstick my bzr, please.

From: Lennart Borgman
Subject: Re: Help me unstick my bzr, please.
Date: Sat, 16 Jan 2010 11:02:50 +0100

On Sat, Jan 16, 2010 at 10:54 AM, Eli Zaretskii <address@hidden> wrote:
>> >> >
>> >> > Would somebody please tell me what I might have done to make bzr think
>> >> > I've got 55 modified files?  How might I recover from this?
>> >>
>> >> The "pending merge" message means that in the past (before you made the
>> >> quick fix to the two files) you did:
>> >>
>> >>     bzr merge
>> >>
>> >> This pulled stuff from the local trunk branch, and merged it with your
>> >> local quickfixes branch.  But you have to also run "bzr commit" to
>> >> complete the fix.  You didn't at the time, so the quickfixes branch
>> >> remains in a "the merge has locally finished but it is uncommitted"
>> >> state.
>> >
>> > That's probably what happened.
>> 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.

Thanks Eli, but what worries me is that it looks like one could take a
completely wrong path here after "bzr merge". I might be
misunderstanding something but it looks to me like Alan's quick fix
branch got into a bad state just because he did not do "bzr commit"

Is that really true??? If so why does not bazaar protect against this?

reply via email to

[Prev in Thread] Current Thread [Next in Thread]