From: Chong Yidong <cyd@stupidchicken.com>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Avoiding slowdown in trunk development
Date: Wed, 02 Feb 2011 11:52:45 -0500 [thread overview]
Message-ID: <878vxy1iqq.fsf@stupidchicken.com> (raw)
In-Reply-To: <4D48594C.3070900@cs.ucla.edu> (Paul Eggert's message of "Tue, 01 Feb 2011 11:04:44 -0800")
Paul Eggert <eggert@cs.ucla.edu> writes:
>>> > if that commit fails due to a nearly-simultaneous
>>> > trunk commit by someone else, I typically just revert my copy of the
>>> > trunk and start over.
>> I hope by "revert" you meant "bzr up", not "bzr revert". The short
>> time window for the kind of race condition that could happen in this
>> situation will rarely cause changes in parts that are related to your
>> changes.
>
> Near-simultaneous changes have caused problems for me.
> bzr may be good at merging, but its errors are common enough to be of
> concern to me. So I take a more cautious approach using "bzr revert".
> This approach has not caused problems.
For stuff like the gnulib merge, it would be easier for you to work in a
branch. No need to worry about using "bzr revert".
If I'd realized the gnulib changes would have broken the Windows build
for so long, I would have recommended doing them in a branch on
savannah.gnu.org first. Then Eli could have fixed the Windows
compilation problems in the branch, before the new code was merged into
the trunk.
next prev parent reply other threads:[~2011-02-02 16:52 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-30 23:43 gnulib strftime imported into Emacs Paul Eggert
2011-01-31 4:00 ` Eli Zaretskii
2011-01-31 8:02 ` Paul Eggert
2011-01-31 9:44 ` joakim
2011-01-31 9:59 ` Miles Bader
2011-01-31 10:16 ` joakim
2011-01-31 10:31 ` Miles Bader
2011-01-31 11:27 ` Eli Zaretskii
2011-01-31 11:06 ` Eli Zaretskii
2011-01-31 14:30 ` Tom Tromey
2011-01-31 14:43 ` Eli Zaretskii
2011-01-31 19:49 ` Eli Zaretskii
2011-01-31 22:19 ` Paul Eggert
2011-01-31 22:29 ` Lennart Borgman
2011-01-31 23:57 ` Paul Eggert
2011-02-01 0:15 ` Lennart Borgman
2011-02-01 0:24 ` Paul Eggert
2011-02-01 0:34 ` Lennart Borgman
2011-02-01 4:05 ` Eli Zaretskii
2011-02-01 7:08 ` Paul Eggert
2011-02-01 8:58 ` Avoiding slowdown in trunk development (was: gnulib strftime imported into Emacs) Eli Zaretskii
2011-02-01 19:04 ` Avoiding slowdown in trunk development Paul Eggert
2011-02-01 19:54 ` Lennart Borgman
2011-02-01 19:57 ` Eli Zaretskii
2011-02-02 16:52 ` Chong Yidong [this message]
2011-01-31 11:17 ` gnulib strftime imported into Emacs Lennart Borgman
2011-01-31 11:37 ` Eli Zaretskii
2011-01-31 11:52 ` Lennart Borgman
2011-01-31 13:01 ` Eli Zaretskii
2011-01-31 13:17 ` Andreas Schwab
2011-01-31 14:44 ` Eli Zaretskii
2011-01-31 14:54 ` Andreas Schwab
2011-01-31 15:14 ` Eli Zaretskii
2011-01-31 13:18 ` Lennart Borgman
2011-01-31 14:45 ` Eli Zaretskii
2011-01-31 19:50 ` Eli Zaretskii
2011-01-31 11:32 ` Andy Moreton
2011-01-31 19:53 ` Eli Zaretskii
2011-01-31 14:56 ` Eli Zaretskii
2011-01-31 16:56 ` Stefan Monnier
2011-01-31 20:06 ` Eli Zaretskii
2011-01-31 20:42 ` Stefan Monnier
2011-01-31 19:54 ` Eli Zaretskii
2011-01-31 23:25 ` Paul Eggert
2011-02-01 4:07 ` Eli Zaretskii
2011-02-01 6:25 ` Paul Eggert
2011-02-01 8:32 ` Eli Zaretskii
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=878vxy1iqq.fsf@stupidchicken.com \
--to=cyd@stupidchicken.com \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--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 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).