Sorry for going back to an old mail... but....
On 10/24/06, Carl Worth <cworth@xxxxxxxxxx> wrote:
On Mon, 23 Oct 2006 19:26:57 -0500, "Matthew D. Fuller" wrote:
>
> On Mon, Oct 23, 2006 at 04:24:30PM -0700 I heard the voice of
> Linus Torvalds, and lo! it spake thus:
> >
> > The problem? How do you show a commit that is _common_ to two
> > branches, but has different revision names in them?
>
> Why would you?
Assume you've got two long-lived branches and one periodically gets
merged into the other one. The combined history might look as follows
(more recent commits first):
f g
| |
d e
|\ /
b c
|/
a
The point is that it is extremely nice to be able to visualize things
that way. Say I've got a "dev" branch that points at f and a "stable"
branch that points at g. With this, a command like:
gitk dev stable
would result in a picture just like the above. Can a similar figure be
made with bzr? Or only the following two separate pictures:
I wanted to test how hard it is. So I created a small plugin that will
show the relationsships between revisions... The following commands
bzr init-repo repo --trees
bzr init repo/branchA
cd repo/branchA
bzr whoami --branch "Test Devel 1 <test1@xxxxxxxxx>"
bzr ci --unchanged -m a1
bzr ci --unchanged -m a2
bzr branch . ../branchB
bzr ci --unchanged -m a3
bzr ci --unchanged -m a4
cd ../branchB
bzr whoami --branch "Test Devel 2 <test2@xxxxxxxxx>"
bzr ci --unchanged -m b1
bzr ci --unchanged -m b2
bzr merge ../branchA
bzr ci -m merge
bzr ci --unchanged -m b3
bzr ci --unchanged -m b4
cd ../branchA
bzr merge ../branchB
bzr ci -m merge
bzr ci --unchanged -m a5
cd ../branchB
bzr ci --unchanged -m b5
cd ..
bzr dotrepo > test.dot
dot -Tpng test.dot > dotrepo.png
Creates the picture you can see at
http://erik.bagfors.nu/bzr-plugins/dotrepo.png
Please remember that this is a 15 min implementation and as such might
suck (the output is not perfect for example, it's slow, etc). This
just brings in every revision in the entire repo, but to expand it to
just take the branches on the command line, is perfectly possible.
But still.. there is no problem to create this.
/Erik
ps. the plugin can be bzr branched from
http://erik.bagfors.nu/bzr-plugins/dotrepo/
--
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
