394857 - CVS copy files from gfx/src/os2 to widget

Status: RESOLVED FIXED

(mozilla.org :: CVS: Copy, task)

Description

[Peter Weilbacher]

Attachment: cvs copy file

We need some files that are still used in widget/src/os2 copied over from gfx/src/os2, at least in the short term. See bug 389729.

Comment 1

[matthew zeier [:mrz]]

Looking for an ack from the folks on Cc...

Comment 2

[Peter Weilbacher]

An extra OK shouldn't be needed, OS/2 only stuff is exempt from the extra approval1.9 and only needs one review.

Comment 3

[Dave Miller [:justdave]]

For normal patches, sure.  CVS copies require an approval from the destination module owner, no matter which module they're in.  owners.html says that's roc for this module.  Sometimes I'll go with an okay from a peer depending on who it is, and I'd be fine with that here, but that's still pavlov or vlad.

Comment 4

[Robert O'Callahan (:roc) (email my personal email if necessary)]

I think Peter should be considered the owner of widget/src/os2, and on that basis I happily grant any review+ required here.

Comment 5

[matthew zeier [:mrz]]

So copied - 

[root@dm-cvs01 mozilla]# cat /opt/cvsmgmt/279576.script | /opt/cvsmgmt/verify-bulk-copy.pl
[root@dm-cvs01 mozilla]# cat /opt/cvsmgmt/279576.script | /opt/cvsmgmt/bulk-copy.pl 
Moving gfx/src/os2/nsGfxDefs.h -> widget/src/os2/nsGfxDefs.h ...
branchlist = 1.16.50;1.14.24;1.2.16;1.1.10
Deleting branch 1.1.10...
RCS file: widget/src/os2/nsGfxDefs.h,v
deleting revision 1.1.10.1
done
RCS file: widget/src/os2/nsGfxDefs.h,v
rcs: widget/src/os2/nsGfxDefs.h,v: no side branches present for 1.1
Deleting branch 1.2.16...
RCS file: widget/src/os2/nsGfxDefs.h,v
deleting revision 1.2.16.1
done
RCS file: widget/src/os2/nsGfxDefs.h,v
rcs: widget/src/os2/nsGfxDefs.h,v: no side branches present for 1.2
Deleting branch 1.14.24...
RCS file: widget/src/os2/nsGfxDefs.h,v
deleting revision 1.14.24.1
done
RCS file: widget/src/os2/nsGfxDefs.h,v
rcs: widget/src/os2/nsGfxDefs.h,v: no side branches present for 1.14
Deleting branch 1.16.50...
RCS file: widget/src/os2/nsGfxDefs.h,v
deleting revision 1.16.50.1
done
RCS file: widget/src/os2/nsGfxDefs.h,v
rcs: widget/src/os2/nsGfxDefs.h,v: no side branches present for 1.16
Moving gfx/src/os2/nsOS2Uni.cpp -> widget/src/os2/nsOS2Uni.cpp ...
branchlist = 1.4.4;1.1.50
Deleting branch 1.1.50...
RCS file: widget/src/os2/nsOS2Uni.cpp,v
deleting revision 1.1.50.1
done
RCS file: widget/src/os2/nsOS2Uni.cpp,v
rcs: widget/src/os2/nsOS2Uni.cpp,v: no side branches present for 1.1
Deleting branch 1.4.4...
RCS file: widget/src/os2/nsOS2Uni.cpp,v
deleting revision 1.4.4.1
done
RCS file: widget/src/os2/nsOS2Uni.cpp,v
rcs: widget/src/os2/nsOS2Uni.cpp,v: no side branches present for 1.4
Moving gfx/src/os2/nsOS2Uni.h -> widget/src/os2/nsOS2Uni.h ...
branchlist = 1.3.16
Deleting branch 1.3.16...
RCS file: widget/src/os2/nsOS2Uni.h,v
deleting revision 1.3.16.1
done
RCS file: widget/src/os2/nsOS2Uni.h,v
rcs: widget/src/os2/nsOS2Uni.h,v: no side branches present for 1.3
Moving gfx/src/os2/nsPaletteOS2.cpp -> widget/src/os2/nsPaletteOS2.cpp ...
branchlist = 1.1.10
Deleting branch 1.1.10...
RCS file: widget/src/os2/nsPaletteOS2.cpp,v
deleting revision 1.1.10.1
done
RCS file: widget/src/os2/nsPaletteOS2.cpp,v
rcs: widget/src/os2/nsPaletteOS2.cpp,v: no side branches present for 1.1
Moving gfx/src/os2/nsPaletteOS2.h -> widget/src/os2/nsPaletteOS2.h ...
branchlist = 1.1.10
Deleting branch 1.1.10...
RCS file: widget/src/os2/nsPaletteOS2.h,v
deleting revision 1.1.10.1
done
RCS file: widget/src/os2/nsPaletteOS2.h,v
rcs: widget/src/os2/nsPaletteOS2.h,v: no side branches present for 1.1
Moving gfx/src/os2/nsPrintOS2.cpp -> widget/src/os2/nsPrintOS2.cpp ...
branchlist = 
Moving gfx/src/os2/nsPrintOS2.h -> widget/src/os2/nsPrintOS2.h ...
branchlist = 
[root@dm-cvs01 mozilla]# 

Comment 6

[Reed Loden [:reed]]

It is your responsibility to remove the old files.

Comment 7

[Walter Meinl]

As a side note, I checked out the tree from December last year and it pulled also nsPaletteOS2.{cpp,h}, which broke the compilation of the old code in nsWindow.cpp. It took me a while to figure out that I have to delete those files, as nsWindow includes nsPaletteOS2.h and obviously the version pulled is not the same as it was at that time in gfx\src\os2. 

Comment 8

[Peter Weilbacher]

Let's handle fixing those files in bug 395491. Morphing a CVS: Copy bug is probably not a good idea...

Comment 9

[Dave Miller [:justdave]]

If you pulled by date and got the files in the new location, then something's wrong.  Our copy scripts do fudge the dates on the old versions when copying the file to the new location, so a checkout by date shouldn't pull it if the date you specify is more than a couple minutes before we copied it.

Comment 10

[Walter Meinl]

Attachment: Entries file after pull

pull command
make -f mozilla\client.mk checkout MOZ_CO_PROJECT=browser,suite MOZ_CO_DATE="2006-12-07 23:45 PDT" MOZ_CO_FLAGS=-PA
from the entries its v1.1 of both files, they were changed the last time long before my co date and should be 1.4 for nsPaletteOS2.cpp and 1.5 for the header.

Comment 11

[Peter Weilbacher]

Sorry, I had misunderstood what Walter was trying to tell us. I indeed see the new files even when doing a plain
   cvs co -D"2006-12-07" mozilla/widget/src/os2
So I better reopen...

Comment 12

[Dave Miller [:justdave]]

Ooooohhh...  we have a Y2K bug in our script. :)

Or more precisely, and older version of CVS had a Y2K bug and our script doesn't deal with the way said older version of CVS screws up the files.

Some of the revisions in a couple of those files have "99" for the year in the date instead of "1999", so our script didn't think it looked like a date, and didn't touch it.

The files that were part of this move have been manually corrected.  I'll be fixing the script to catch this if we ever move files this old again.