Re: broken link and wrong character set
On Mon, Dec 13, 1999 at 02:54:09PM +0100, Chahine Hamila wrote:
>
> Thank you. Actually I did but it looks like I forgot to commit it. Now that I
> try I get this error message when I try to add, and it tells me I should add
> .wmlrc when I try to update it. I don't know if the update was done or if this
> is some kind of fatal error:
> cvs server: .wmlrc added independently by second party
>
This error means that someone else already added the file. Simply move your
copy out of the way and do a cvs update.
> > The other problem is that we are
> > still deciding how links to other languages should be displayed.
> >
> > The links to the translations page are written using the native encoding,
> > which won't show up correctly in some cases. One solution would be to move
> > to a universal character set (ISO 10646). It is unclear to me how widely
> > supported this is.
>
> ISO 10646 is Unicode right? AFAIK it is supported by windows Arabic browsers,
> but none under Linux does.
>
I'm pretty sure that a unix browser will support all singly byte languages
as long as you have the right font installed.
> Sorry. The volunteer who translated the page used a WYSIWYG html editor and
> I haven't checked everything before adding it. I've reworked it and I hope
> everything is fixed now.
>
Great.
My apologies if I am wrong, but it appears you have a misconception about the
way CVS works. If someone else commits a change to a file and you try to commit
a change before updating to the latest version, you will get an error. If it
allowed you to commit without updating your local copy first, you would overwrite
their changes. You don't have to worry about an update ruining your local changes
because CVS is intelligent. When you update, it will silently merge the two
copies as long as there are no conflicts (you both change the same part of the
document). If you have both modified the same part of the document, CVS will
tell you there is a conflict (the update line for that file will begin with
a 'C'). The possible responses for an update are:
U FILE
The file was updated
P FILE
Like 'U", but a patch was sent instead of sending the entire file
A FILE
The file has been added to your local copy and will be added to main repository
at the next commit.
R FILE
The file has been removed
M FILE
Changes from the main repository were merged with your local copy, or you have
modified your local copy and not committed the changes yet.
C FILE
As explained above, the changes from the main repository couldn't be merged
cleanly with your local copy.
Hope this helps.
--
James (Jay) Treacy
treacy@debian.org
Reply to: