[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 10:16:37 +0100

On Sat, Jan 16, 2010 at 8:48 AM, Eli Zaretskii <address@hidden> wrote:
>> > When I execute bzr status, it gives me a list of ~55 allegedly modified
>> > files, finishing up with:
>> >
>> >     pending merge tips: (use -v to see all merge revisions)
>> >       Jan D. 2010-01-06 [merge] Fix slowdown and wrong font choosed by 
>> >
>> > 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?

reply via email to

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