From: Teemu Likonen <tlikonen@iki.fi>
To: emacs-devel@gnu.org
Subject: DVCS workflow and bisect
Date: Thu, 21 Jan 2010 18:33:46 +0200 [thread overview]
Message-ID: <87my07beol.fsf@mithlond.arda> (raw)
May I voice an opinion about working with DVCS? I'm an Emacs user, not
developer, so feel free to ignore my comment. :-) Anyway, I just noticed
a problem in the DVCS history which makes diffs more difficult to read.
I'll visualize my point with "git log --graph --oneline":
* d5836ff * lisp/dired-aux.el (dired-hide-all): [...]
* a633481 * lisp/dired-aux.el (dired-hide-all): [...]
* f8314a5 Fix ccl encoding of unibyte source.
|\
| * e81c42c from trunk
| |\
| |/
|/|
* | fff9e27 Remove file that only works with CVS, [...]
* | 62b5494 (tab-always-indent): Fix custom-type.
| * 21287dd Fix ccl encoding of unibyte source.
| |\
| |/
|/|
* | 36d899a Redate and reposition log entry.
* | 02fcc7e Fix bug#5395: typing '#' in an empty C buffer [...]
(The left-most vertical line is the trunk. Asterisks [*] are commits.)
We can see that commit 21287dd [1] fixes some ccl encoding issues and at
the same time it merges stuff from the trunk. That results in a huge
diff from which is difficult to find the actual "ccl encoding" fix. See
$ bzr diff -c revid:handa@m17n.org-20100120023352-5323ovgsrok9nr72
in the Bazaar repo. The "ccl encoding" fix can be found by explicitly
asking the other parent --
$ bzr diff -r revid:acm@muc.de-20100119222724-07lwniug0azx5qu8..revid:handa@m17n.org-20100120023352-5323ovgsrok9nr72
-- but that's more difficult. Also, the version control history will be
difficult to bisect if that change introduced a bug.
My point is not to say that the author of the commit did any serious
damage or anything. I'm just suggesting that merging stuff and making
other changes should be separate commits.
---------------
1. In Bazaar: revid:handa@m17n.org-20100120023352-5323ovgsrok9nr72
next reply other threads:[~2010-01-21 16:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-21 16:33 Teemu Likonen [this message]
2010-01-21 18:43 ` DVCS workflow and bisect Óscar Fuentes
2010-01-22 4:26 ` Stephen J. Turnbull
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=87my07beol.fsf@mithlond.arda \
--to=tlikonen@iki.fi \
--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).