[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Re: merging...
From:       Roman Maurer <roman.maurer () hermes ! si>
Date:       2001-03-22 17:12:59
[Download RAW message or body]

>  cvs update -j KDE_2_1_BRANCH

Better yet, merge file by file with GNU Emacs (other editors may have
the merging support for CVS too).  Here are step-by-step instructions:

 1. Determine the files that have changed (we'll take an example,
    filetypes.po).

 2. Go in HEAD branch and open filetypes.po in Emacs.

 3. Choose Tools | Merge | Revisions with Ancestor ...

   3.1. When prompted for version 1 to merge, press enter to have
        the current buffer's latest version.

   3.2. When prompted for version 2, write "KDE_2_1_BRANCH".

   3.3. When prompted for ancestor version, write "KDE_2_1_RELEASE"
        (note _2_1_, not _2_1_1_).

 4. Emacs has now opened three buffers in Ediff mode.  The bottom one
    is for final version and the two on the top are buffers from
    sections 3.1 and 3.2.

 5. Press "$" to ignore non-clashable changes in both versions.

 6. Use "N"/"P" to navigate and "A" or "B" to take text from buffers
    A or B.  You can also correct text from bottom buffer by hand.

 7. When you reach the end of PO file, use File | Save as ... and
    write to, say, filetypes.po.  Then you can commit it.

 8. You can leave Emacs with Ctrl-X Ctrl-C.  :-)

Hope that this will help someone - I for one am certainly very
impressed with this merging feature and that's one of the reasons
I like Emacs ...
-- 
	Pozdrav,
	  Roman

[prev in list] [next in list] [prev in thread] [next in thread]