From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16709 invoked by alias); 18 Feb 2013 16:20:01 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 16671 invoked by uid 22791); 18 Feb 2013 16:20:00 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Date: Mon, 18 Feb 2013 16:20:00 -0000 From: Jan Kratochvil To: Tom Tromey Cc: Project Archer Subject: Re: Proposal to change branch maintenance Message-ID: <20130218161949.GB18304@host2.jankratochvil.net> References: <874nhipla5.fsf@fleche.redhat.com> <20130213121556.GA21353@host2.jankratochvil.net> <87k3q5d2mp.fsf@fleche.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87k3q5d2mp.fsf@fleche.redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2013-q1/txt/msg00010.txt.bz2 On Mon, 18 Feb 2013 17:10:22 +0100, Tom Tromey wrote: > Also I think we should delete all the branches that we got from > gdb.git. There's no need for them in archer.git. I already did so, where do you see them? archer.git "master" deletion (+branches cleanup) Message-ID: <20111226231836.GA32067@host2.jankratochvil.net> http://sourceware.org/ml/archer/2011-q4/msg00010.html http://sourceware.org/ml/archer/2012-q1/msg00001.html > I found this that shows a way that we could make README.archer work > without excessive merge issues: > > http://stackoverflow.com/questions/2108405/branch-descriptions-in-git > http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-s/930495#930495 Those are two big pages with many solutions, which one do you mean? I quickly found there only dropping of the merged content; but in fact the list of merged branches would be exactly useful during the merging: Currently I track a separate file "IMPORT" generating the merged branches list there (currently only 2, there were many), this could be done automatically now, see the header of: http://pkgs.fedoraproject.org/cgit/gdb.git/tree/gdb-archer.patch > Alternatively we could pick the README file name based on the branch > name. This isn't as convenient but it would also work. The convenience depends on whether it is for branch author or for the merge maintainer. :-) Jan