From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Giorgos Keramidas <keramida@ceid.upatras.gr>,
acm@muc.de, emacs-devel@gnu.org
Subject: Re: Help me unstick my bzr, please.
Date: Sat, 16 Jan 2010 14:36:06 -0500 [thread overview]
Message-ID: <jwv6371sv4l.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83k4vicwws.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Jan 2010 09:48:51 +0200")
>> 6. Commit them with "bzr commit".
> Why not simply
> $ bzr merge --force
Other than the issues already mentioned, there's also the fact that
Bazaar developpers discourage its use and are not very interested in
making it work right. So, among other things, this will tend to remerge
things that were already merged and then create spurious conflicts.
It may get confused in other ways as well, I just know that the few
times I tried to use it, I quickly got sufficiently annoyed that
I consider it basically unusable.
Stefan
next prev parent reply other threads:[~2010-01-16 19:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 22:27 Help me unstick my bzr, please Alan Mackenzie
2010-01-16 2:37 ` Giorgos Keramidas
2010-01-16 7:48 ` Eli Zaretskii
2010-01-16 8:29 ` Stephen J. Turnbull
2010-01-16 8:41 ` Stephen J. Turnbull
2010-01-16 8:59 ` Eli Zaretskii
2010-01-17 6:04 ` Stephen J. Turnbull
2010-01-16 9:02 ` Giorgos Keramidas
2010-01-16 9:57 ` Eli Zaretskii
2010-01-16 10:04 ` Giorgos Keramidas
2010-01-16 9:16 ` Lennart Borgman
2010-01-16 9:53 ` Andreas Schwab
2010-01-16 9:54 ` Eli Zaretskii
2010-01-16 9:59 ` Giorgos Keramidas
2010-01-16 10:02 ` Lennart Borgman
2010-01-16 11:17 ` Eli Zaretskii
2010-01-17 6:23 ` Simple unsticking with 'bzr shelve' [was: Help me unstick ...] Stephen J. Turnbull
2010-01-16 19:36 ` Stefan Monnier [this message]
2010-01-16 21:38 ` Help me unstick my bzr, please Alan Mackenzie
2010-01-17 7:50 ` Giorgos Keramidas
2010-01-16 10:10 ` Eli Zaretskii
2010-01-16 21:27 ` Alan Mackenzie
2010-01-16 21:32 ` Juanma Barranquero
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv6371sv4l.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=acm@muc.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=keramida@ceid.upatras.gr \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).