From: Eli Zaretskii <eliz@gnu.org>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: VC and bzr.
Date: Thu, 22 Apr 2010 21:58:29 +0300 [thread overview]
Message-ID: <83633j48mi.fsf@gnu.org> (raw)
In-Reply-To: <871ve75t1e.fsf@telefonica.net>
> From: Óscar Fuentes <ofv@wanadoo.es>
> Date: Thu, 22 Apr 2010 18:52:13 +0200
>
> Both `bzr log' and `git log --first-parent' are screwed by the workflow
>
> merge from trunk into my feature branch
> then, push to trunk
Unless you work on a feature for a very long time (months), there
should be no reasons for the "merge from trunk" part.
For example, I committed a few days ago 3-weeks worth of development
on a local branch, with no interim merges from mainline whatsoever.
When I merged back to the trunk, before committing to repository, I
had only 2 merge conflicts (one of them in ChangeLog, which cannot be
avoided, but is trivially fixed).
Perhaps we should modify the instructions on the wiki slightly, to
make the workflow slightly less annoying due to frequent slow commits
and at the same time avoid screwing up what "bzr log" shows on the
mainline.
next prev parent reply other threads:[~2010-04-22 18:58 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-21 18:37 VC and bzr Jan Djärv
2010-04-21 20:38 ` Dan Nicolaescu
2010-04-21 22:19 ` Andreas Schwab
2010-04-22 5:26 ` Jan Djärv
2010-04-22 8:56 ` Andreas Schwab
2010-04-22 9:45 ` Jan D.
2010-04-22 10:26 ` Andreas Schwab
2010-04-22 11:56 ` Jan D.
2010-04-22 11:58 ` Jan D.
2010-04-22 13:24 ` Andreas Schwab
2010-04-22 13:21 ` Andreas Schwab
2010-04-22 13:32 ` Óscar Fuentes
2010-04-22 13:51 ` Andreas Schwab
2010-04-22 14:26 ` Óscar Fuentes
2010-04-22 14:38 ` Andreas Schwab
2010-04-22 14:58 ` Óscar Fuentes
2010-04-22 16:06 ` Andreas Schwab
2010-04-22 16:52 ` Óscar Fuentes
2010-04-22 18:58 ` Eli Zaretskii [this message]
2010-04-22 19:31 ` Óscar Fuentes
2010-04-22 20:54 ` Eli Zaretskii
2010-04-22 21:34 ` Stefan Monnier
2010-04-22 22:18 ` Óscar Fuentes
2010-04-23 1:34 ` Stefan Monnier
2010-04-23 2:18 ` Óscar Fuentes
2010-04-23 8:29 ` Eli Zaretskii
2010-04-23 14:32 ` Stefan Monnier
2010-04-23 14:43 ` Óscar Fuentes
2010-04-23 15:36 ` Eli Zaretskii
2010-04-23 16:54 ` Davis Herring
2010-04-23 21:34 ` Dan Nicolaescu
2010-04-25 20:18 ` Davis Herring
2010-04-25 21:20 ` Dan Nicolaescu
2010-04-23 20:31 ` Óscar Fuentes
2010-04-23 20:43 ` Eli Zaretskii
2010-04-23 21:13 ` Dan Nicolaescu
2010-04-23 21:16 ` Óscar Fuentes
2010-04-23 22:21 ` Juanma Barranquero
2010-04-22 19:10 ` Andreas Schwab
2010-04-22 19:47 ` Óscar Fuentes
2010-04-22 21:40 ` Andreas Schwab
2010-04-22 14:18 ` Jan D.
2010-04-22 14:39 ` Andreas Schwab
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=83633j48mi.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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).