I'm not interested in bashing either tool (I'm not a git user),
but see below for some options in bzr you seem to not be aware
of.
>>>>> "Michael" == Michael Olson <[EMAIL PROTECTED]> writes:
Michael> 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?
Michael> Here's an example of what I mean.
Michael> Let's compare the output from both "git log" and "bzr log" for the
Michael> changes made since May 20.
Michael> Note all of the useless "Merge from <person>"
Michael> entries in the bzr log output. These would have
Michael> been completely removed, all of them, if we were
Michael> using git, because all of the changes were
Michael> "fast-forwards": no real merge needed. Sure, you
Michael> could have done "bzr pull" instead of a "bzr merge",
Michael> which would have removed some of the messages
Michael> ... but then you get penalized with a message about
Michael> needing to run "bzr merge" in case a real merge is
Michael> required. With git, you could run a "git merge",
Michael> and you would still get a fast-forward commit in
Michael> this case, with no spurious "Merged from <person>"
Michael> entries. This makes for a more comfortable merge
Michael> experience.
Try 'bzr merge --pull' if that is what you prefer.
Michael> Note how all of the interesting information about
Michael> the bzr changes has been literally "marginalized" by
Michael> indenting the entire log entry (including authorship
Michael> info) by 4 spaces, while the uninteresting merge
Michael> summary info takes the primary focus by having no
Michael> indentation. What we should care about are the
Michael> changes, not the merge commit by which they happened
Michael> to enter our repo.
<snip/>
Try 'bzr log --short' or 'bzr --line' or consider writing your
own customized log formatter.
HTH,
Vincent
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
