[Top][All Lists]

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

Re: Error in BZR Wiki document?

From: Óscar Fuentes
Subject: Re: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 16:01:29 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux)

Jan Djärv <address@hidden> writes:

> Quote:
> "The merge may fail due to a change that conflicts with your
> branch. You’ll need to fix the problem (looking for conflict markers
> and editing, just as in CVS), then
>       bzr resolve -m file-you-changed ...      # Mark these conflicts
> as resolved.
>                                                # Bazaar keeps track of
> unresolved conflicts,
>                                                # and won't let you
> commit until all are resolved.
> "
> Ok, I edit ChangeLog and remove markers, then:
> % bzr resolve -m ChangeLog
> bzr: ERROR: no such option: -m

Yup, that's an error on the document.

> Hmm, lets remove -m then:
> % bzr resolve ChangeLog
> src/ChangeLog is not conflicted

I think that when you open a conflicted file on Emacs, it activates
SMerge and after you remove the conflict text markers and save the
file, SMerge automatically does a `bzr resolve'.

> What is bzr resolve supposed to do anyway?

It prevents you from committing a conflicted file.

> (BTW, pulling trunk again for 5 Mbytes worth of changes required 177
> Mbytes to download from the server).

Hmmm... after the big 180 MB download a few hours ago, pulling again
right now required 6 MB.

I see nothing on the commits made by Stefan that justify a download of
177 MB, but maybe that hitted something on the internal storage of bzr
that triggered a pessimization.


reply via email to

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