From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: dealing with local patches - mercurial queues over bzr/git checkout Date: Mon, 06 Jan 2014 23:04:05 +0100 Message-ID: <87fvp0hine.fsf@igel.home> References: <1389035494635-308685.post@n5.nabble.com> <83r48ksys4.fsf@gnu.org> <87vbxw93t8.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389046022 21034 80.91.229.3 (6 Jan 2014 22:07:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Jan 2014 22:07:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 06 23:07:08 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W0IKA-0000Zd-Rd for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 23:07:06 +0100 Original-Received: from localhost ([::1]:37814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IKA-0003At-BI for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 17:07:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IHN-00018E-Qw for emacs-devel@gnu.org; Mon, 06 Jan 2014 17:04:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0IHI-00016n-J0 for emacs-devel@gnu.org; Mon, 06 Jan 2014 17:04:13 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:48569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0IHI-00016a-Cc for emacs-devel@gnu.org; Mon, 06 Jan 2014 17:04:08 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3dyrN66pbfz4KKJK; Mon, 6 Jan 2014 23:04:06 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3dyrN66W77zbbfh; Mon, 6 Jan 2014 23:04:06 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id OEolQygngXFo; Mon, 6 Jan 2014 23:04:05 +0100 (CET) X-Auth-Info: fvPa4rkDLJKkNpj/tDbmSp+doJNhIXf/EmahtAY53rU= Original-Received: from igel.home (ppp-46-244-235-239.dynamic.mnet-online.de [46.244.235.239]) by mail.mnet-online.de (Postfix) with ESMTPA; Mon, 6 Jan 2014 23:04:05 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 831E42C039B; Mon, 6 Jan 2014 23:04:05 +0100 (CET) X-Yow: Is this where people are HOT and NICE and they give you TOAST for FREE?? In-Reply-To: <87vbxw93t8.fsf@Rainer.invalid> (Achim Gratz's message of "Mon, 06 Jan 2014 22:51:47 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167531 Archived-At: Achim Gratz writes: > If you have lots of changes that create merge conflicts, you'll want > to find a way to (almost) automatically deal with them, but you'd have > the same problem with actual merges. git rerere is supposed to help with repeatedly solving merge conflicts. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."