385639 - CVS copies for bug 385539

Status: RESOLVED FIXED

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

Description

[Simon Montagu :smontagu]

Attachment: cvscopy script

The cvs copies in the attached script are for bug 385539 "need to move nsBidi::SymmSwap into intl/unicharutil"

Comment 1

[Simon Montagu :smontagu]

Attachment: cvscopy v.2

I think it makes sense to keep all this stuff together...

Comment 2

[Aravind Gottipati [:aravind]]

Tried to do this, but noticed some collisions.

[root@dm-cvs01 mozilla]# /opt/cvsmgmt/verify-bulk-copy.pl < /opt/cvsmgmt/385639.script 
intl/unicharutil/tools/Attic/gensymmtable.pl,v already exists
intl/unicharutil/tools/Attic/genbidicattable.pl,v already exists
[root@dm-cvs01 mozilla]# 

Assigning to dave.

Comment 3

[Dave Miller [:justdave]]

This copy isn't possible as two of the destination files already exist.  You'll need to re-evaluate what you're doing.

Comment 4

[Simon Montagu :smontagu]

Those two files used to be in intl/unicharutil/tools but were moved to layout/tools in bug 120818. Does that mean that they can never be moved back to their original location? If so, I suppose I can work around it by changing their names or putting them in intl/unicharutil/utils instead

Comment 5

[Dave Miller [:justdave]]

if they're moved back, they need to be resurrected from the existing files, we don't get to keep their history from the new location.

Comment 6

[Simon Montagu :smontagu]

Attachment: cvscopy v.3

Ok, let's put them in intl/unicharutil/util with the files they generate.

Comment 7

[Dave Miller [:justdave]]

I'm technically on vacation at the moment, so punting back to someone who's around.

Comment 8

[Aravind Gottipati [:aravind]]

[root@dm-cvs01 mozilla]# /opt/cvsmgmt/bulk-copy.pl < /opt/cvsmgmt/385639.script 
Moving layout/base/nsBidiUtils.h -> intl/unicharutil/util/nsBidiUtils.h ...
branchlist = 
Moving layout/base/nsBidiUtils.cpp -> intl/unicharutil/util/nsBidiUtils.cpp ...
branchlist = 3.14.28;3.14.28.1.4
Deleting branch 3.14.28.1.4...
RCS file: intl/unicharutil/util/nsBidiUtils.cpp,v
deleting revision 3.14.28.1.4.1
done
RCS file: intl/unicharutil/util/nsBidiUtils.cpp,v
rcs: intl/unicharutil/util/nsBidiUtils.cpp,v: no side branches present for 3.14.28.1
Deleting branch 3.14.28...
RCS file: intl/unicharutil/util/nsBidiUtils.cpp,v
deleting revision 3.14.28.3
done
RCS file: intl/unicharutil/util/nsBidiUtils.cpp,v
deleting revision 3.14.28.2
done
RCS file: intl/unicharutil/util/nsBidiUtils.cpp,v
deleting revision 3.14.28.1
done
RCS file: intl/unicharutil/util/nsBidiUtils.cpp,v
rcs: intl/unicharutil/util/nsBidiUtils.cpp,v: no side branches present for 3.14
Moving layout/base/symmtable.h -> intl/unicharutil/util/symmtable.h ...
branchlist = 3.5.12
Deleting branch 3.5.12...
RCS file: intl/unicharutil/util/symmtable.h,v
deleting revision 3.5.12.1
done
RCS file: intl/unicharutil/util/symmtable.h,v
rcs: intl/unicharutil/util/symmtable.h,v: no side branches present for 3.5
Moving layout/base/bidicattable.h -> intl/unicharutil/util/bidicattable.h ...
branchlist = 3.7.12
Deleting branch 3.7.12...
RCS file: intl/unicharutil/util/bidicattable.h,v
deleting revision 3.7.12.1
done
RCS file: intl/unicharutil/util/bidicattable.h,v
rcs: intl/unicharutil/util/bidicattable.h,v: no side branches present for 3.7
Moving layout/tools/gensymmtable.pl -> intl/unicharutil/util/gensymmtable.pl ...
branchlist = 1.1.12
Deleting branch 1.1.12...
RCS file: intl/unicharutil/util/gensymmtable.pl,v
deleting revision 1.1.12.1
done
RCS file: intl/unicharutil/util/gensymmtable.pl,v
rcs: intl/unicharutil/util/gensymmtable.pl,v: no side branches present for 1.1
Moving layout/tools/genbidicattable.pl -> intl/unicharutil/util/genbidicattable.pl ...
branchlist = 1.5.12;1.1.12;1.1.72
Deleting branch 1.1.72...
RCS file: intl/unicharutil/util/genbidicattable.pl,v
deleting revision 1.1.72.1
done
RCS file: intl/unicharutil/util/genbidicattable.pl,v
rcs: intl/unicharutil/util/genbidicattable.pl,v: branch number 1.1.72 too high
Deleting branch 1.1.12...
RCS file: intl/unicharutil/util/genbidicattable.pl,v
deleting revision 1.1.12.1
done
RCS file: intl/unicharutil/util/genbidicattable.pl,v
rcs: intl/unicharutil/util/genbidicattable.pl,v: no side branches present for 1.1
Deleting branch 1.5.12...
RCS file: intl/unicharutil/util/genbidicattable.pl,v
deleting revision 1.5.12.1
done
RCS file: intl/unicharutil/util/genbidicattable.pl,v
rcs: intl/unicharutil/util/genbidicattable.pl,v: no side branches present for 1.5

Comment 9

[Reed Loden [:reed]]

The CVS copy has been completed as requested. Do remember that you are responsible for deleting the old files.

Comment 10

[Simon Montagu :smontagu]

Thanks! I'll do the CVS removes over in bug 385539.