On Fri, 2007-07-13 at 17:10 -0700, Linus Torvalds wrote:
>
> On Sat, 14 Jul 2007, David Woodhouse wrote:
> >
> > On the occasions I actually try to _use_ branches, I find it very
> > suboptimal.
>
> This seems to be very personal.
Yeah, much of it. Although I've also seen other people trying to get to
grips with git and tripping up over branches recently. It _was_ getting
easier, for a while :)
> But I literally tend to just use branches for something small. I don't
> personally tend to have any long-term live branches (apart from the remove
> ones, obviously). I create a branch, do something in it, merge it, and
> go back to master.
I don't usually bother with that. I just do something in HEAD and then
reset (possibly after pushing it to some tree elsewhere for posterity).
> I don't even use ccache, and I don't care. Probably because most of the
> time the rebuild time really isn't that long for me, and for the kernel,
> the much more painful part is actually the rebooting part.
I can usually find some other machine to reboot than the machine I'm
working on. Don't these people send you enough toys? :)
I've also spent most of the last year travelling and hence working on my
laptop, which isn't the beefiest build machine I've ever had the
pleasure of using. Changing branches, when I've done it, really has been
a pain.
> But the place where branches *really* rock is when you don't even switch
> to them, but use the data from them locally (cherry-picking from them,
> or doing something like "git show origin/pu:builtin-blame.c" etc).
You can achieve much of that just by sharing object directories, and
I'll admit that sometimes I do set up temporary branches just for the
purpose of cherry-picking by name ('foo^^' etc.) without having to paste
sha1sums from the other tree.
> And for that to work, you have to get used to having multiple branches in
> the tree, even if you don't check them out - and once you do that,
> switching between them isn't really that confusing any more, because it's
> already part of your "mind map" of how the repo works.
I'm sure it's true that if I persist I'll get used to it, as will the
newbies who have trouble with branches. But mostly I suspect that I'll
get used to it by learning how best to work around it and keep separate
trees of my own, even when people persist in having multiple branches on
their servers. And while today's set of newbies will get used to it,
tomorrow's set of newbies will also find it troubling.
Nothing really prevents you from using branches _locally_ if you want
to, but still keeping separate trees on the _servers_. I just think that
might be a more cunning way forward. But as you correctly point out,
that's just my personal viewpoint.
--
dwmw2
-
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
