Re: Committing a previously edited file

[Ahmad Al-rasheedan <asr at baldi dot cc>]

On Thursday 14 August 2003 05:29, Ossama Khayat wrote:
> Salam,
> I'm trying to commit the full_wordlist_U.po file after Nadim has fixed the
> header of the file. I get an error that I cannot do this because
> "Up-to-date check failed for `translate/wordlist/full_wordlist_U.po'".
>
> I don't know how to use diff anyway. Anyone?
>

Nidim passed me this since I went through the same. It worked.

$ mv full_wordlist_U.po my_U.po    # save off your file
$ cvs update full_wordlist_U.po    # this gets the newer copy of P
$ diff full_wordlist_U.po my_U.po  # locate the 2 "NEW" entries to copy
$ vi my_U.po                       # add the two entries by hand
$ mv my_U.po full_wordlist_P.po      # now your copy is golden
$ cvs commit  full_wordlist_P.po

Regards,
-- 
Ahmad Al-rasheedan (http://webhost.fasttelco.com/asr)