[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Bug-gnubg] How to merge bug fix into 0.15 branch

From: Jonathan Kinsey
Subject: Re: [Bug-gnubg] How to merge bug fix into 0.15 branch
Date: Sat, 25 Nov 2006 10:23:09 +0000
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv: Gecko/20061025 Thunderbird/ Mnenhy/

I've figured it out - the commands needed are:

1. Get 0.15 version of file (eg. rel_0_15 of gtkprefs.c)
        cvs update -rrel_0_15 gtkprefs.c
2. Merge fix (eg. change 1.136)
        cvs update -j1.135 -j1.136 gtkprefs.c
3. Check it in and then change back to head version:
        cvs ci
        cvs update -A gtkprefs.c


Christian Anthon wrote:
> I meant checkout the 0.15 branch in a separate directory and then
>> cvs update -j1.135 -j1.136 gtkprefs.c
>> resolve any conflicts, edit the ChangeLog and then
>> cvs ci
>> Christian.

Attachment: signature.asc
Description: OpenPGP digital signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]