Mailing List Archive

Moshe wrote:

> On Wed, 28 Jun 2000, Fred L. Drake wrote:
>
> > + * Update the filecmp documentation (Moshe?).
>
> I'm waiting for Gordon to check-in his directory comparisons to
> filecmp. Gordon?

Looking at CVS, my stuff was there in filecmp revision 1.2
(+299 -38) and wiped out by 1.3 (+38 -299) which was done
the following day.

- Gordon

[Gordon]
> > Looking at CVS, my stuff was there in filecmp revision 1.2
> > (+299 -38) and wiped out by 1.3 (+38 -299) which was done the
> > following day.
[Guido]
> Argh! An inappropriate side effect of Ping's cleanup -- thanks
> for catching this. Apparently Ping didn't do a CVS update before
> generating his diffs.
>
> I can restore version 1.2 easily, but I'm not sure what to do
> with /F's changes (1.3 -> 1.4). Gordon, can you look at this and
> suggest what to do?

If you have the eff-bot's diff, it should apply to 1.2 (my changes
are all below there - basically I added a rewritten dircmp). I
think a CVS merge would do the right thing, too.

- Gordon

> Moshe wrote:
>
> > On Wed, 28 Jun 2000, Fred L. Drake wrote:
> >
> > > + * Update the filecmp documentation (Moshe?).
> >
> > I'm waiting for Gordon to check-in his directory comparisons to
> > filecmp. Gordon?
>
> Looking at CVS, my stuff was there in filecmp revision 1.2
> (+299 -38) and wiped out by 1.3 (+38 -299) which was done
> the following day.

Argh! An inappropriate side effect of Ping's cleanup -- thanks for
catching this. Apparently Ping didn't do a CVS update before
generating his diffs.

I can restore version 1.2 easily, but I'm not sure what to do with
/F's changes (1.3 -> 1.4). Gordon, can you look at this and suggest
what to do?

--Guido van Rossum (home page: http://www.python.org/~guido/)

> [Gordon]
> > > Looking at CVS, my stuff was there in filecmp revision 1.2
> > > (+299 -38) and wiped out by 1.3 (+38 -299) which was done the
> > > following day.
> [Guido]
> > Argh! An inappropriate side effect of Ping's cleanup -- thanks
> > for catching this. Apparently Ping didn't do a CVS update before
> > generating his diffs.
> >
> > I can restore version 1.2 easily, but I'm not sure what to do
> > with /F's changes (1.3 -> 1.4). Gordon, can you look at this and
> > suggest what to do?

[Gordon]
> If you have the eff-bot's diff, it should apply to 1.2 (my changes
> are all below there - basically I added a rewritten dircmp). I
> think a CVS merge would do the right thing, too.

There was a change in indent style, so effbot's diff didn't apply
cleanly -- but your suggestion made me realize that it was easy to
re-apply manually.

It's all fixed now. Thanks all!

--Guido van Rossum (home page: http://www.python.org/~guido/)

On Thu, 29 Jun 2000, Guido van Rossum wrote:
>
> Argh! An inappropriate side effect of Ping's cleanup -- thanks for
> catching this. Apparently Ping didn't do a CVS update before
> generating his diffs.

My apologies! I'm pretty sure i did an update, but i must have
left too long a gap during which 1.2 got checked in. You'd think
somehow a version-control system would have noticed the inconsistency
between ancestor versions...

Anyway, very sorry for the trouble. Glad it appears to be cleared
up now.


-- ?!ng