[Scummvm-devel] git force-push

[Florian Kagerer]

Hi Willem Jan,

thanks for your attempt to clean this up. I am not going to try to do this
myself for obvious reasons.
I am rather clueless about the cause of the issue and with regard to
possible solutions.
I think all my commits made it into your branch. To avoid unnecessary
regressions I'd prefer not to have particular commits deleted (if that's
what the suggestion to 'squash together' commits is about). I don't mind if
commit messages get modified.


Cheers,
Florian


> -----Ursprüngliche Nachricht-----
> Von: Willem Jan Palenstijn [mailto:wjp at usecode.org]
> Gesendet: Dienstag, 17. Mai 2011 13:59
> An: Max Horn
> Cc: scummvm-devel at lists.sourceforge.net
> Betreff: Re: [Scummvm-devel] git force-push
> 
> On Tue, May 17, 2011 at 01:48:24PM +0200, Max Horn wrote:
> >
> > Am 17.05.2011 um 00:19 schrieb Willem Jan Palenstijn:
> >
> > > Hi all,
> > >
> > > Hopefully nobody noticed, but in case anybody is affected, Johannes
> did a
> > > force-push of master to d47eceeb2fdd122efb143d00097c0cf159552bb2 a
> little
> > > while ago to correct a merge gone wrong at
> > > 15ea9b15cbb1210b14490819c5bc04f72ed7e6c8.
> >
> > Anyhow, is somebody working on getting the real commits behind that
> failed
> > push into the tree now?
> 
> I made a quick attempt last night at
> https://github.com/wjp/scummvm/commits/fix/
> , but would like to hear from Florian.
> 
> That branch includes a suggestion by Johannes to squash together the
> 'detune'
> commits since those first increased and then decreased the savegame
> version
> number.
> 
> At a quick glance it looks like it could benefit from some more
> squashing, but
> that's more of a subjective matter.
> 
> 
> -Willem Jan
> 
> -----------------------------------------------------------------------
> -------
> Achieve unprecedented app performance and reliability
> What every C/C++ and Fortran developer should know.
> Learn how Intel has extended the reach of its next-generation tools
> to help boost performance applications - inlcuding clusters.
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel