[Gforge-devel] gettext change

[Robert Nelson]

I realize you know better, I was just venting.  I've spent most of today
debugging problems that I was sure I'd already fixed and then remerging back
in all my changes once I realized what happened.

> -----Original Message-----
> From: gforge-devel-bounces at lists.gforge.org [mailto:gforge-devel-
> bounces at lists.gforge.org] On Behalf Of Roland Mas
> Sent: Friday, March 16, 2007 1:45 AM
> To: gforge-devel at lists.gforge.org
> Subject: Re: [Gforge-devel] gettext change
> 
> Robert Nelson, 2007-03-16 01:01:24 -0700 :
> 
> > When you committed your gettext changes you wiped out most of my
> > previous commits to the trunk.
> 
>   That's strange.  When I updated my working tree with your changes, I
> got lots of conflicts, so I started from a clean checkout (with your
> changes) and re-ran the gettext conversion from there.
> 
> > This wiped out a bunch of the database changes, the changes to
> > support internet explorer and the bug fixes.
> 
>   I do remember changing a "include database-$sys_database_type.php"
> to a "include database.php", since the variable wasn't defined here,
> but nothing else.
> 
> > Usually the way you resolve conflicts is by merging your changes
> > with the conflicting ones; you don't just throw away everyone else's
> > changes in favour of your own.
> 
>   I know, I know.
> 
> > What a waste of many hours worth of effort on my part!
> 
>   I must have done something not according to my plans then.  I
> apologize about that.
> 
> Roland.
> --
> Roland Mas
> 
> [...] Des fois, y'a des trous. -- (Ptiluc)
>   -- Signatures à collectionner, série n°2, partie 3/3.
> _______________________________________________
> Gforge-devel mailing list
> Gforge-devel at lists.gforge.org
> http://lists.gforge.org/mailman/listinfo/gforge-devel