From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-return-39986-listarch-gdb=sources.redhat.com@sourceware.org>
Received: (qmail 7466 invoked by alias); 14 Oct 2011 08:04:09 -0000
Received: (qmail 7454 invoked by uid 22791); 14 Oct 2011 08:04:07 -0000
X-SWARE-Spam-Status: No, hits=-1.0 required=5.0	tests=AWL,BAYES_00,SPF_SOFTFAIL,TW_BZ
X-Spam-Check-By: sourceware.org
Received: from mtaout20.012.net.il (HELO mtaout20.012.net.il) (80.179.55.166)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 14 Oct 2011 08:03:43 +0000
Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LT100800PBAX200@a-mtaout20.012.net.il> for gdb@sourceware.org; Fri, 14 Oct 2011 10:03:42 +0200 (IST)
Received: from HOME-C4E4A596F7 ([84.229.17.178]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LT10086HQE4GZF0@a-mtaout20.012.net.il>; Fri, 14 Oct 2011 10:03:41 +0200 (IST)
Date: Fri, 14 Oct 2011 08:04:00 -0000
From: Eli Zaretskii <eliz@gnu.org>
Subject: Re: GIT and CVS
In-reply-to: <20111014050245.GC18867@adacore.com>
To: Joel Brobecker <brobecker@adacore.com>
Cc: jan.kratochvil@redhat.com, joseph@codesourcery.com, pmuldoon@redhat.com, gdb@sourceware.org
Reply-to: Eli Zaretskii <eliz@gnu.org>
Message-id: <83ipnsknj3.fsf@gnu.org>
References: <m3sjmwn0nh.fsf@redhat.com> <Pine.LNX.4.64.1110132017120.23193@digraph.polyomino.org.uk> <m3obxkmx2i.fsf@redhat.com> <Pine.LNX.4.64.1110132135270.23193@digraph.polyomino.org.uk> <20111013215927.GA13931@host1.jankratochvil.net> <83mxd41qu4.fsf@gnu.org> <20111014050245.GC18867@adacore.com>
X-IsSubscribed: yes
Mailing-List: contact gdb-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb.sourceware.org>
List-Subscribe: <mailto:gdb-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb/>
List-Post: <mailto:gdb@sourceware.org>
List-Help: <mailto:gdb-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-owner@sourceware.org
X-SW-Source: 2011-10/txt/msg00111.txt.bz2

> Date: Thu, 13 Oct 2011 22:02:45 -0700
> From: Joel Brobecker <brobecker@adacore.com>
> Cc: Jan Kratochvil <jan.kratochvil@redhat.com>, joseph@codesourcery.com,
> 	pmuldoon@redhat.com, gdb@sourceware.org
> 
> One problem that you are not mentioning is the fact that the ChangeLog
> causes a never-ending stream of conflicts when applying patches.

This problem has been solved quite some time ago, both in git (where
you have git-merge-changelog driver), and in bzr (where you have the
changelog_merge plugin, now distributed as part of core bzr).  I use
the latter, and didn't have a single ChangeLog conflict in many
months.