Mailing-List: contact stdcxx-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: stdcxx-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of msebor@gmail.com designates
 64.233.166.178 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=beta;
        h=received:message-id:date:from:user-agent:mime-version:to:subject:references:in-reply-to:content-type:content-transfer-encoding:sender;
        b=G2lw0dW42itxFZx+Q93su0SJVg20OlZJsDPnKavGy1HU+A+wfP+BiZ0bian+ozZbSDr513jXiV32WTXrOnitoIWNzfF65Mo2o1wtxshi8osZDMWBGMl+1hD/KhJLjb11AjtwqBG19JdbmqjIY0ZcIlbh5IMaK6HTzdSSIXf+s7U=
Message-ID: <47019EEC.3000703@roguewave.com>
Date: Mon, 01 Oct 2007 19:29:16 -0600
From: Martin Sebor <sebor@roguewave.com>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
 rv:1.8.1.2pre) Gecko/20070111 SeaMonkey/1.1
MIME-Version: 1.0
To: stdcxx-dev@incubator.apache.org
Subject: Re: merging trunk to 4.2.0
References: <46F2B63C.9010906@roguewave.com>
 <12891733.post@talk.nabble.com>	 <46FD7F89.9010606@roguewave.com>
 <46FD86BA.1000309@roguewave.com>	 <46FDC6A4.4070008@roguewave.com>
 <d21d65950709290407p30d26b9fic2968f165a9e71fe@mail.gmail.com>
In-Reply-To: <d21d65950709290407p30d26b9fic2968f165a9e71fe@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: Martin Sebor <msebor@gmail.com>

Michael van der Westhuizen wrote:
> Hi Martin,
> 
> On 9/29/07, Martin Sebor <sebor@roguewave.com> wrote:
>> have easily missed it. If that was it, I kick myself in the head
>> because the whole dang merge took me almost two days to finish!
> 
> Have you considered using svnmerge? It will let you cherry-pick
> changes and fixes from trunk into the RC branch. You'll also be able
> to block revisions from being considered for merge. The  killer
> feature (for me) is bidirectional merging. Apparently it will be
> possible to move from svnmerge to the official merge support in the
> upcoming SVN 1.5.
> 
> Have a look at http://www.orcaware.com/svn/wiki/Svnmerge.py - it could
> save you a day and a half in the future :-)

Thanks for the tip! I had not considered using a more intelligent
tool that the svn client. I'll keep in it mind the next time I do
a big merge.

Martin

> 
> Michael
>