Michael Olson <[EMAIL PROTECTED]> writes: > Reasons that I prefer git over bzr: > > - Merges look terrible in the bzr log output. What's up with the > indentation and the redundant listing of commits that are in the > merge?
Here's an example of what I mean.
Let's compare the output from both "git log" and "bzr log" for the
changes made since May 20.
Note all of the useless "Merge from <person>" entries in the bzr log
output. These would have been completely removed, all of them, if we
were using git, because all of the changes were "fast-forwards": no real
merge needed. Sure, you could have done "bzr pull" instead of a "bzr
merge", which would have removed some of the messages ... but then you
get penalized with a message about needing to run "bzr merge" in case a
real merge is required. With git, you could run a "git merge", and you
would still get a fast-forward commit in this case, with no spurious
"Merged from <person>" entries. This makes for a more comfortable merge
experience.
Note how all of the interesting information about the bzr changes has
been literally "marginalized" by indenting the entire log entry
(including authorship info) by 4 spaces, while the uninteresting merge
summary info takes the primary focus by having no indentation. What we
should care about are the changes, not the merge commit by which they
happened to enter our repo.
Also, bzr includes some arbitrary "branch nick" indicator in each log
message which just clutters the output and bleeds unneeded information
about the committer's top-level directory name back to the maintainer's
repo.
===== BEGIN git log output =====
commit 1b2549957abc1214c4d5ead1863d699a89c3a2a2
Author: Stephen Leake <[EMAIL PROTECTED]>
Date: Mon May 26 18:35:43 2008 -0400
lisp/dvc-buffers.el (dvc-get-buffer): Don't check for buffer renamed;
allows using uniquify.
commit 8f585cdab3be88531c71787944deea24eeb821c9
Author: Stephen Leake <[EMAIL PROTECTED]>
Date: Mon May 26 08:18:09 2008 -0400
Put error buffer in dvc-process-buffer-mode. xmtn-run don't pass --root.
* lisp/dvc-buffers.el (dvc-show-last-error-buffer): Put error buffer in
dvc-process-buffer-mode, so have DVC-Buffers menu.
* lisp/xmtn-revlist.el (xmtn--setup-revlist): Add comment.
(xmtn--log-helper): Add comment.
* lisp/xmtn-run.el (xmtn--run-command-sync): Don't pass --root.
(xmtn--run-command-async): Don't pass --root.
commit 718c6fff62951b8525ffc012b9ccb866e5373b95
Author: Stephen Leake <[EMAIL PROTECTED]>
Date: Sat May 24 09:20:28 2008 -0400
Add menu item to show last error buffer. Improve dvc-diff-log to not prompt
for tree when run from a diff buffer.
* lisp/dvc-buffers.el (dvc-show-last-error-buffer): New function.
(dvc-buffers-menu): use it.
* lisp/dvc-diff.el (dvc-diff-mode-map): Use new dvc-diff-log-tree,
dvc-diff-log-single, dvc-show-last-error-buffer.
(dvc-diff-file-menu-list): Use new dvc-diff-log-tree,
dvc-diff-log-single.
(dvc-diff-log-single): Renamed from dvc-diff-log.
(dvc-diff-log-tree): New.
commit 1c2e7a324d94ca2943ecaef52df1edfcda60b4a3
Author: Stephen Leake <[EMAIL PROTECTED]>
Date: Sat May 24 07:58:23 2008 -0400
Fix xmtn-dvc-log for a specified file.
* lisp/dvc-unified.el (dvc-log): Set prefer-current for
dvc-read-project-tree-maybe.
* lisp/xmtn-dvc.el (xmtn--close-set): Rewrite to fix infinite-loop bug.
(xmtn--get-content-changed-closure): Add last-n argument.
* lisp/xmtn-revlist.el (xmtn-list-revisions-modifying-file): Support
last-n, refresh.
===== END git log output =====
===== BEGIN bzr log output =====
------------------------------------------------------------
revno: 416
committer: Stefan Reichoer <[EMAIL PROTECTED]>
branch nick: dvc-main
timestamp: Tue 2008-05-27 21:55:19 +0200
message:
Merged from Stephen Leake: Added dvc-show-last-error-buffer and some other
useful improvements
------------------------------------------------------------
revno: 286.1.102
committer: Stephen Leake <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Mon 2008-05-26 18:38:01 -0400
message:
merge from stefan
------------------------------------------------------------
revno: 286.1.101
committer: Stephen Leake <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Mon 2008-05-26 18:35:43 -0400
message:
lisp/dvc-buffers.el (dvc-get-buffer): Don't check for buffer renamed;
allows using uniquify.
------------------------------------------------------------
revno: 286.1.100
committer: Stephen Leake <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Mon 2008-05-26 08:18:09 -0400
message:
Put error buffer in dvc-process-buffer-mode. xmtn-run don't pass --root.
* lisp/dvc-buffers.el (dvc-show-last-error-buffer): Put error buffer in
dvc-process-buffer-mode, so have DVC-Buffers menu.
* lisp/xmtn-revlist.el (xmtn--setup-revlist): Add comment.
(xmtn--log-helper): Add comment.
* lisp/xmtn-run.el (xmtn--run-command-sync): Don't pass --root.
(xmtn--run-command-async): Don't pass --root.
------------------------------------------------------------
revno: 286.1.99
committer: Stephen Leake <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-05-24 09:20:28 -0400
message:
Add menu item to show last error buffer. Improve dvc-diff-log to not
prompt for tree when run from a diff buffer.
* lisp/dvc-buffers.el (dvc-show-last-error-buffer): New function.
(dvc-buffers-menu): use it.
* lisp/dvc-diff.el (dvc-diff-mode-map): Use new dvc-diff-log-tree,
dvc-diff-log-single, dvc-show-last-error-buffer.
(dvc-diff-file-menu-list): Use new dvc-diff-log-tree,
dvc-diff-log-single.
(dvc-diff-log-single): Renamed from dvc-diff-log.
(dvc-diff-log-tree): New.
------------------------------------------------------------
revno: 415
committer: Stefan Reichoer <[EMAIL PROTECTED]>
branch nick: dvc-main
timestamp: Mon 2008-05-26 20:55:23 +0200
message:
Merged from Stephen Leake: Fix xmtn-dvc-log for a specified file.
------------------------------------------------------------
revno: 286.1.98
committer: Stephen Leake <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-05-24 08:06:09 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 286.1.97
committer: Stephen Leake <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-05-24 07:58:23 -0400
message:
Fix xmtn-dvc-log for a specified file.
* lisp/dvc-unified.el (dvc-log): Set prefer-current for
dvc-read-project-tree-maybe.
* lisp/xmtn-dvc.el (xmtn--close-set): Rewrite to fix infinite-loop bug.
(xmtn--get-content-changed-closure): Add last-n argument.
* lisp/xmtn-revlist.el (xmtn-list-revisions-modifying-file): Support
last-n, refresh.
------------------------------------------------------------
revno: 414
committer: Stefan Reichoer <[EMAIL PROTECTED]>
branch nick: dvc-main
timestamp: Wed 2008-05-21 19:36:31 +0200
message:
Merged from Michael Olson: Various xgit improvements improved manual start
page
------------------------------------------------------------
[snip even more merge output from before May 21.]
===== END bzr log output =====
--
| Michael Olson | FSF Associate Member #652 |
| http://mwolson.org/ | Hobbies: Lisp, HCoop |
| Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
`-------------------------------------------------------'
pgpxUpmqBYOXi.pgp
Description: PGP signature
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
