How to integrate your files into NetBeans CVS
Below are the instructions on how to commit your files to the NetBeans
CVS
repository using the NetBeans IDE. If you have write access to NetBeans
CVS
server under translatedfiles, you can integrate your files freely.
PLEASE note that you need to validate your files before your
integration.
I'm using NetBeans 6.0 dev version for this instruction but most UIs
are the same, so you can use NetBeans 5.x.
Overview
This is the flow of the check out process and integration.
Checkout
Get copies from the cvs server
into your
local folder. All localization files exist under
translatedfiles/src
You need to check out the
folder first.
Update your localized files
Copy your updated files
into the folder.
Validate your updates
Before you check in (commit) the
updates, please review your
updates.
It is very important to
pay attention to these instructions:
- Please do not integrate unnecessary
files
- Please do not overwrite other
language files
- Please integrate into the correct branch
Commit
Check in your files into
the CVS server.
When you integrated wrong files, please remove them quickly. You can
refer the
instruction
about deleting.
Verify
Verify your updates on
daily build,
validation page, and status page.
1. Checkout
Get
files from the CVS repository. Select Versioning -> CVS
-> Checkout to open the Checkout dialog.
In the Checkout dialog box, please
enter your
CVS Root, which is usually
:pserver:<your_netbeans.org_id>@cvs.netbeans.org/cvs
and your password. Click Next.
Please entire these values
into the
fields.
Module:
translatedfiles/src
Branch: your
target branch,
e.g.
release551
Local Folder:
your preferred
local folder. In this example,
/home/katakai/NetBeansProjects/cvscheckin
If you want to update just a few modules, you can add the specific
folder, such as
translatedfiles/src/db
Checking out of entire translatedfiles/src will take a long time.
Tip: How to
update translatedfiles.netbeans.org web document
If you want to update web docs, please try to
checkout
translatedfiles/www
and
blank
for Branch.
Click Finish. Checkout is
starting. You
can check the checkout log in Output window
like below.
If the Output window is not
displayed on
your NetBeans yet, please select
Window -> Output -> Output
Also you can select Show Output on the context menu of Checking out....
You can stop the checkout by selecting Cancel Process.
Once checkout is done, you will be asked you want to create a new
project. You should select Close here.
2. Add the checked out folder into Favorites window
To use the checkout files,
we can use
the Favorites window. Select Window > Favorites to open the
Favorites
window
On the Favorites window, click
the right menu
and select Add to Favorites...
menu item
Browse to the folder where
you checked
out the sources. In this
example, go to /home/katakai/NetBeansProjects/cvscheckin and select src
under translatedfiles.
3. Updates only
If you have already checked out
the sources,
then to update them, select
CVS -> Update menu. The updates of remote CVS server will be copied
to your locale folder and it will be synced and updated to the latest.
4. Update files
If you use OmegaT, your
files are being
generated under the target folder of OmegaT project. Please copy
only
necessary files into the local folder.
For example, if you're editing the project module, your files should be
generated under target/project folder. Please find only
*_<lang>.properties and *_<lang>.html files
and copy them
into translatedfiles/src/project folder.
These are very important:
- Please do not integrate unnecessary
files
- Please do not overwrite other
language files
- Please integrate into the correct branch
If you're working on the Spanish localization for example, please touch
only
the Bundle_es.properties; do not touch the Bundle_ja.properties.
5. Check which files will be updated by Show Changes
Once you update the files
under
translatedfiles/src, please select the
folders and right click to open the context menu, select CVS ->
Show
Changes
The updates are being
shown in CVS
window.
Please
check these
status and files carefully!!
For example, the file "Bundle_es_es.properties
is marked as "Locally
New", which means the file is new and new file will be created in cvs
after the commit. However, "Bundle_es_es.properties" is not correct!!
"Bundle_es.properties" is correct. Please ignore these files.
Here is an another case. "Databases.html" is marked as "Locally New"
but the file name should be "Databases_es.html". "_es" is missing!!
Please correct these errors and Show Updates again until these errors
will disappear.
Please check
your OmegaT configuration and correct these
errors.
6. Check diffs
If such errors disappear,
please check
the diffs. Double clicking on the
file will invoke the Diff window.You may find unexpected update string.
7. Commit
Once you verify the diffs,
select
necessary files and select Commit...
from context menu.
Enter valid comment into the Commit Message field.
Please
make sure the
expected files are listed here.
If OK, please click Commit button.
You can see the commit log in Output window.
You will get a
notification email if you have subscribed to
cvs@translatedfiles.netbeans.org mailing list.
Notification can be browsed:
Source codes can be browsed:
8. Verify
Please verify your updates
in the
status and validation pages.
NetBeans 5.5.1:
You can verify the updates in next daily build. Or you can build
NetBeans IDE by yourself. See the following documentation.
How to remove unnecessary files from CVS
If you integrated wrong files into cvs,
please remove them quickly.
1. Check out files
2. Remove files from disk
You can use project window to remove them. Also you can remove those
files outside NetBeans, by using rm command and file exproler.
3. Check updates
The removed files will be marked as "Locally Removed", please check
carefully.
4. Commit the "Locally Removed" files
Please commit only "Locally Removed" files.
- Please make sure these files are not necessary
- Please do not remove other languages files
References
Please send you questions to dev@translatedfiles.netbeans.org.
