From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 16:01:29 +0100 [thread overview]
Message-ID: <87aawsh9yu.fsf@telefonica.net> (raw)
In-Reply-To: 4B434F61.6090305@swipnet.se
Jan Djärv <jan.h.d@swipnet.se> 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.
--
Óscar
next prev parent reply other threads:[~2010-01-05 15:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-05 14:40 Error in BZR Wiki document? Jan Djärv
2010-01-05 15:01 ` Óscar Fuentes [this message]
2010-01-05 15:45 ` Stefan Monnier
2010-01-06 3:32 ` Karl Fogel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87aawsh9yu.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.