On Thursday 04 September 2008 21:49:27 Junio C Hamano wrote:

quoted text
> > git blame still works, and git log --sparse path/to/file works, of
> > course. --sparse makes giving a path a bit pointless, of course, but we
> > probably can live with that for time being. I'm still open for
> > suggestions, of course. :)
>
> Give both directories, like:
>
> 	"git log -- newdir olddir"
>
> perhaps?

Better, but really ugly, as we'll have to keep doing this for the rest of t=
he=20
project's life to get the full history. And while it's all nice and fun for=
=20
git log -- source3/configure.in source/configure.in, it's less fun for deep=
er=20
paths.

We'll probably end up just doing a git-filter-branch renaming the samba3=20
source dir source3 from the beginning and the samba4 source dir source4 fro=
m=20
the beginning, and then do the octopus merge. Without any paths changing,=20
that should probably work. It's a bit annoying to break all external=20
branches, but we only need to do this once, and people will only need to=20
git-format-patch and git-am once, and we can provide a step-by-step guide f=
or=20
this as well.

Thanks for the feedback, though. :)

Cheers,
Kai

=2D-=20
Kai Blin
WorldForge developer  http://www.worldforge.org/
Wine developer        http://wiki.winehq.org/KaiBlin
Samba team member     http://www.samba.org/samba/team/
=2D-
Will code for cotton.