Mea Culpa

[John Darrington]

Sorry.  Looking at the gitweb page it seems that somehow I've
inadvertently merged the master branch down to the stable branch.
I've no idea how I did that.

I don't really want to try fixing it, in case I make matters worse.
So I'm afraid I'm going to have to wait until somebody who knows what
they're doing (ie Ben) has the time to look at it.

Sorry about that.

--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.




_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[Ben Pfaff]

John Darrington <john@...> writes:

> Sorry.  Looking at the gitweb page it seems that somehow I've
> inadvertently merged the master branch down to the stable branch.
> I've no idea how I did that.

What did you intend to do?  I can probably fix it.
--
Ben Pfaff
http://benpfaff.org


_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[John Darrington]

On Tue, Sep 16, 2008 at 07:59:51AM -0700, Ben Pfaff wrote:

     What did you intend to do?  I can probably fix it.


It's difficult to tell what went wrong by looking at "git log",
because it sorts by commit date, not push date.  However, by
going through the pspp-commits mailing list archives, I think
there was only one erronous push, the most recent one:

http://lists.gnu.org/archive/html/pspp-commits/2008-09/msg00009.html

All I meant to do in that action was a simple change to
src/language/command.def marking CORRELATIONS and PEARSON CORRELATIONS
as unimplemented.

J'

--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.




_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[Ben Pfaff]

John Darrington <john@...> writes:

> On Tue, Sep 16, 2008 at 07:59:51AM -0700, Ben Pfaff wrote:
>
>      What did you intend to do?  I can probably fix it.
>
>
> It's difficult to tell what went wrong by looking at "git log",
> because it sorts by commit date, not push date.  However, by
> going through the pspp-commits mailing list archives, I think
> there was only one erronous push, the most recent one:
>
> http://lists.gnu.org/archive/html/pspp-commits/2008-09/msg00009.html
>
> All I meant to do in that action was a simple change to
> src/language/command.def marking CORRELATIONS and PEARSON CORRELATIONS
> as unimplemented.

OK.  I rewound the "stable" branch to where (I think) it was
before that push.  If there seems to be anything missing from it,
please let me know.
--
Ben Pfaff
http://benpfaff.org


_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[John Darrington]

On Thu, Sep 18, 2008 at 09:18:37PM -0700, Ben Pfaff wrote:
     John Darrington <john@...> writes:
     
     > On Tue, Sep 16, 2008 at 07:59:51AM -0700, Ben Pfaff wrote:
     >
     >      What did you intend to do?  I can probably fix it.
     >
     >
     > It's difficult to tell what went wrong by looking at "git log",
     > because it sorts by commit date, not push date.  However, by
     > going through the pspp-commits mailing list archives, I think
     > there was only one erronous push, the most recent one:
     >
     > http://lists.gnu.org/archive/html/pspp-commits/2008-09/msg00009.html
     >
     > All I meant to do in that action was a simple change to
     > src/language/command.def marking CORRELATIONS and PEARSON CORRELATIONS
     > as unimplemented.
     
     OK.  I rewound the "stable" branch to where (I think) it was
     before that push.  If there seems to be anything missing from it,
     please let me know.


The two pushes I made on 14 September no longer seem to be there.

J'

--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.




_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[Ben Pfaff]

John Darrington <john@...> writes:

> On Thu, Sep 18, 2008 at 09:18:37PM -0700, Ben Pfaff wrote:
>      John Darrington <john@...> writes:
>      
>      > On Tue, Sep 16, 2008 at 07:59:51AM -0700, Ben Pfaff wrote:
>      >
>      >      What did you intend to do?  I can probably fix it.
>      >
>      > It's difficult to tell what went wrong by looking at "git log",
>      > because it sorts by commit date, not push date.  However, by
>      > going through the pspp-commits mailing list archives, I think
>      > there was only one erronous push, the most recent one:
>      >
>      > http://lists.gnu.org/archive/html/pspp-commits/2008-09/msg00009.html
>      >
>      > All I meant to do in that action was a simple change to
>      > src/language/command.def marking CORRELATIONS and PEARSON CORRELATIONS
>      > as unimplemented.
>      
>      OK.  I rewound the "stable" branch to where (I think) it was
>      before that push.  If there seems to be anything missing from it,
>      please let me know.
>
>
> The two pushes I made on 14 September no longer seem to be there.

As you say, "pushes" aren't a very useful unit because they
aren't recorded in the log; they can't be, due to the way that
Git tracks commits.

The following commits are the ones that I guess you are referring
to.  Is that correct?  I can easily add them, or other commits
that you identify, to the stable branch.

commit 7ce6874eaf41e67636bbc5677b3b5016fa2324cc
Author: John Darrington <john@...>
Date:   Sun Sep 14 21:29:53 2008 +0800

    Don't append % to count totals.
   
    There was an erroneous '%' appended to the totals for count
    values. This change removes it.  Fixes bug #24003

commit 1134f778a7d1e729190065ce58f02b228e3c0a21
Author: John Darrington <john@...>
Date:   Sun Sep 14 20:51:38 2008 +0800

    Don't destroy dictionary on error if we didn't create it.
   
    Avoid assertion failure on bad input.  Closes bug #24031

commit 4b6ee946a98a755bae4f48629e31a5493cbf7bbd
Author: John Darrington <john@...>
Date:   Sun Sep 14 16:57:10 2008 +0800

    Fixed bug which caused a crash if "end data." was not left aligned.

--
Ben Pfaff
http://benpfaff.org


_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[John Darrington]

On Thu, Sep 18, 2008 at 09:49:26PM -0700, Ben Pfaff wrote:
     John Darrington <john@...> writes:

     > The two pushes I made on 14 September no longer seem to be there.
     
     As you say, "pushes" aren't a very useful unit because they
     aren't recorded in the log; they can't be, due to the way that
     Git tracks commits.
     
     The following commits are the ones that I guess you are referring
     to.  Is that correct?  I can easily add them, or other commits
     that you identify, to the stable branch.
     
     commit 7ce6874eaf41e67636bbc5677b3b5016fa2324cc
     Author: John Darrington <john@...>
     Date:   Sun Sep 14 21:29:53 2008 +0800
     
         Don't append % to count totals.
         
         There was an erroneous '%' appended to the totals for count
         values. This change removes it.  Fixes bug #24003
     
     commit 1134f778a7d1e729190065ce58f02b228e3c0a21
     Author: John Darrington <john@...>
     Date:   Sun Sep 14 20:51:38 2008 +0800
     
         Don't destroy dictionary on error if we didn't create it.
         
         Avoid assertion failure on bad input.  Closes bug #24031
     
     commit 4b6ee946a98a755bae4f48629e31a5493cbf7bbd
     Author: John Darrington <john@...>
     Date:   Sun Sep 14 16:57:10 2008 +0800
     
         Fixed bug which caused a crash if "end data." was not left aligned.
     


Those are the ones, yes.

--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.




_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev

[Ben Pfaff]

John Darrington <john@...> writes:

> On Thu, Sep 18, 2008 at 09:49:26PM -0700, Ben Pfaff wrote:
>      The following commits are the ones that I guess you are referring
>      to.  Is that correct?  I can easily add them, or other commits
>      that you identify, to the stable branch.
>      
>      commit 7ce6874eaf41e67636bbc5677b3b5016fa2324cc
>      Author: John Darrington <john@...>
>      Date:   Sun Sep 14 21:29:53 2008 +0800
>      
>          Don't append % to count totals.
>          
>          There was an erroneous '%' appended to the totals for count
>          values. This change removes it.  Fixes bug #24003
>      
>      commit 1134f778a7d1e729190065ce58f02b228e3c0a21
>      Author: John Darrington <john@...>
>      Date:   Sun Sep 14 20:51:38 2008 +0800
>      
>          Don't destroy dictionary on error if we didn't create it.
>          
>          Avoid assertion failure on bad input.  Closes bug #24031
>      
>      commit 4b6ee946a98a755bae4f48629e31a5493cbf7bbd
>      Author: John Darrington <john@...>
>      Date:   Sun Sep 14 16:57:10 2008 +0800
>      
>          Fixed bug which caused a crash if "end data." was not left aligned.
>      
>
>
> Those are the ones, yes.

Great, I pushed them back to stable.
--
Ben Pfaff
http://benpfaff.org


_______________________________________________
pspp-dev mailing list
pspp-dev@...
http://lists.gnu.org/mailman/listinfo/pspp-dev