[Unionfs] problem with unionfs git tree

[Erez Zadok]

In message <981e6de60707031351g3bc1ea52m8b9f8e6782ddf211 at mail.gmail.com>, "Simon Sasburg" writes:
> Hi,
> 
> I've been trying to use the instructions on
> http://www.filesystems.org/unionfs-git.html
> to easily keep up to date with the latest version of the unionfs source.
> 
> Its not working so well, when i do a git-pull to update to the latest
> version, it fails with merge errors.

Simon,

Yes, this happens to us too.  The problem is that whenever we rebase our
main branch against a newer -rc release, it changes the base code enough
that a simple "git pull" no longer works.  You have to re-clone your copy.

Now I don't profess to understand git well enough, but if someone knows of a
trick to git-pull a rebased repository w/o resulting in that many conflicts,
I'd love to know.

One trick I've sometimes used is instead of git-pull-ing my checked out
branch against a source repository which had been rebased, I go and rebase
my *own* copy against Linus's tree.  Assuming you know git and can merge the
occasional conflict, this is how you do it:

$ git-fetch  \
	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
$ git-rebase FETCH_HEAD

Cheers,
Erez.