Re: Committing a previously edited file

[Munzir Taha Obeid <munzirtaha at myrealbox dot com>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thursday 14 August 2003 4:04 pm, Ahmad Al-rasheedan wrote:
> 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
>
Sorry I am in a hurry but if I can understand you you can also know about the
diff from here:

http://cvs.arabeyes.org/viewcvs/translate/wordlist/full_wordlist_U.po.diff?r1=1.2&r2=1.3



- --
  __/    __/          _/  _/  _/
 _/ _\  _/ _\            _/
_/    \ /   _\ unzir    _/ aha

Telecommunications Engineer
Linux Registered User #279362 at http://counter.li.org
CIW Designer, ICDL, MOUS.
New Horizons CLC
Riyadh, SA
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE/O5C+yX0LGxQ02yYRAmFGAJ93RGtA63jJUh5hckGRFPudC2uH1ACfVL9h
ySAyksBXG0FS/76A15GH9ME=
=GfY1
-----END PGP SIGNATURE-----