src/dotnet-library/README


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

INFO: The dotnet-library tree has been synchronized with
revision 12880 of src/library on $Date$.

IMPORTANT:
Never, never, never, ever add/remove/edit files in the dotnet-library
tree by hand. If you need to change sth use the opportunity to merge
the changes that have occured since the last merge. Any manual intervention
makes the merging harder and is to be considerd rude and counterproductive.

HOW TO MERGE:
You can obtain the revision number of the last merge from the commit history
of the tree. Or from the second line of this document. But you should
always check to see if it is consistent with svn log messages.


koko:~/scala/src/dotnet-library>svn log -r 12367
------------------------------------------------------------------------
r12367 | mihaylov | 2007-07-19 23:11:21 +0200 (Thu, 19 Jul 2007) | 1 line

Synced dotnet-library/ with rev 12365
------------------------------------------------------------------------


Unless you have a specific revision in mind you can check the lates revision
of the src/library tree with

koko:~/scala>svn info src/library/
Path: src/library
URL: https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk/src/library
Repository Root: https://lampsvn.epfl.ch/svn-repos/scala
Repository UUID: 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
Revision: 12880
Node Kind: directory
Schedule: normal
Last Changed Author: mihaylov
Last Changed Rev: 12880
Last Changed Date: 2007-09-17 12:56:57 +0200 (Mon, 17 Sep 2007)


From this we could figure out that we need to merge the changes that happened
between revisions 12365 and 12880 of the src/library tree:

koko:~/scala/src/dotnet-library>svn merge \
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk/src/library@12365 \
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk/src/library@12880 ./


(note the ./ at the end of the line specifying the working copy)

You'll get many "Skipped missing target: ..." messages because this tree
only contains files that are different for MSIL. Hopefully, changes in those
files do not introduce anything platform-specific because they will be copied
from the src/library tree. If there are platform-specific changes, the
offending file has to be added to the dotnet-library tree and modified to
compile for .NET.

When you have sorted out the conflicts (by means of manual editing and
'svn resolved'), at the top project directory run

ant msil

to check, at the bare minimum, whether the MSIL subset of the library compiles.
If this is fine, you can commit your changes but make sure that in the commit
message you

 INCLUDE THE REVISION NUMBER WITH WHICH YOU HAVE MERGED!!!!

This is very important because subversion will not keep it for you. And this
number is absilutely necessary for the next merge. Also, you should update
the revision number in this document for consistency.

koko:~/scala/src/dotnet-library>svn ci -m "Synced src/dotnet-library with rev 12880 of src/library"
Adding         dotnet-library/README
Sending        dotnet-library/scala/Predef.scala
Sending        dotnet-library/scala/Random.scala
Sending        dotnet-library/scala/runtime/RichString.scala
Transmitting file data ....
Committed revision 12881.