Re: [Bug-gnupod] mktunes.pl creates corrupt iTunesDB ?

[H. Langos]

Hi Richard,


On Wed, Jul 01, 2009 at 04:57:14PM +0200, Richard van den Berg wrote:
> On Wed, July 1, 2009 16:13, Jacinta Richardson wrote:
> > I suspect it's a matter of laziness.
> 
> I claim ignorance. I didn't know there was a fundamental difference
> between the two ways of calling a subroutine. Thanks for the explanation.
> 
> > I'd suggest applying the patch with this tidied up as
> > appropriate.

Done.

Could you check if it still does what it was is supposed to do? :-)

I merged the low_ram branch into master yesterday evening but I wanted 
to sleep over it before commiting.

Here are the changes that actually happend to master:

    git diff 94462eb 25a4d8b

or

http://git.savannah.gnu.org/cgit/gnupod.git/commit/?id=25a4d8ba6a080589577abc20db7587a18b1cade9

It was a bit tricky as the previous merges on low_ram made 
parts of the changes in master look outdated eventhough they 
were more current than than in low_ram.
I hope I didn't mess it up completely. :-)

It may be better to avoid merges among branches.

rather

 -o---o---o---o---o---o---o      master
   \   \   \     /       /
    o   o---o---o       /     topic a
     \                 /
      o---o---o---o---o     topic b

than

 -o---o---o---o---o---o---o      master
   \   \   \     /       /
    o   o---o---o       /     topic a
     \           \     /
      o---o---o---o---o     topic b

Also, if you need to merge several branches into one,
I suggest the usage of octopus merges instead of merging
step by step.

But I'm no git guru. So don't take my word for it.

cheers
-henrik