For example git encourages using many short and longer-lived feature
branches; I don't see bzr encouraging this workflow.
Why not? I think it really does. And due to the fact that merges are
merges and will show up as such, I think it's very suitable for
feature branches.
In fact, in the bzr development of bzr itself. All commits are done
in feature branches and then merged into bzr.dev (the main "trunk" of
bzr) when they are considered stable.
Consider the following
bzr branch mainline featureA
cd featureA
hack hack; bzr commit -m 'f1'; hack hack bzr commit -m f2; etc
No I want to merge in mainline again
bzr merge ../mainline; bzr commit -m merge
hack hack; bzr commit -m f3; hack hack bzr commit -m f4; etc
right now, I would have something line this in the branch log
-----------------------------------------------------------------
committer: Erik Bågfors <erik@xxxxxxxxxx>
branch nick: featureA
message:
f4
-----------------------------------------------------------------
committer: Erik Bågfors <erik@xxxxxxxxxx>
branch nick: featureA
message:
f3
----------------------------------------------------------------
committer: Erik Bågfors <erik@xxxxxxxxxx>
branch nick: featureA
message:
merge
-----------------------------------------------------------------
committer: Foo Bar <foo@xxxxxxx>
branch nick: mainline
message:
something done in mainline
-----------------------------------------------------------------
committer: Foo Bar <foo@xxxxxxx>
branch nick: mainline
message:
something else done in mainline
-----------------------------------------------------------------
committer: Erik Bågfors <erik@xxxxxxxxxx>
branch nick: featureA
message:
f2
-----------------------------------------------------------------
committer: Erik Bågfors <erik@xxxxxxxxxx>
branch nick: featureA
message:
f1
In this view,I can easily see what was part of this feature branch,
because the committs that belongs to the feature branch are not
indented, and they have a "branch nick" of "featureA". I can also
easily see what comes from other branches.
I can also run bzr log with --line or --short which shows you only the
commits made in this branch and not the once that are merged in. So
with --line I would get something line
Erik Bågfors 2006-10-19 f4
Erik Bågfors 2006-10-19 f3
Erik Bågfors 2006-10-19 merge
Erik Bågfors 2006-10-19 f2
Erik Bågfors 2006-10-19 f1
Which will give me a good view of what has been done in this feature
branch only.
If I understand it correctly, in git, you don't really know what has
been committed as part of this branch/repo, and what has been
committed in another branch/repo (this is my understanding from
reading this thread, I might be wrong, feel free to correct me again
:) )
/Erik
--
google talk/jabber. zindar@xxxxxxxxx
SIP-phones: sip:erik_bagfors@xxxxxxxxxxxxxxxx
sip:17476714687@xxxxxxxxxxxxxxxxxxxx
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html