From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5604 invoked by alias); 18 Feb 2013 16:10:44 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 5538 invoked by uid 22791); 18 Feb 2013 16:10:40 -0000 X-SWARE-Spam-Status: No, hits=-6.4 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 From: Tom Tromey To: Jan Kratochvil Cc: Project Archer Subject: Re: Proposal to change branch maintenance References: <874nhipla5.fsf@fleche.redhat.com> <20130213121556.GA21353@host2.jankratochvil.net> Date: Mon, 18 Feb 2013 16:10:00 -0000 In-Reply-To: <20130213121556.GA21353@host2.jankratochvil.net> (Jan Kratochvil's message of "Wed, 13 Feb 2013 13:15:56 +0100") Message-ID: <87k3q5d2mp.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.92 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-q1/txt/msg00006.txt.bz2 Tom> I don't propose renaming existing branches. Jan> IMO if there should be a different naming the existing should be renamed, Jan> otherwise it is more complicated/mess than it was. It seems the consensus is to rename them. So, let's do that. 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'll do the branch deletions next week or so, then the renames after that. Tom> Third, what about adopting a convention for a "README.archer" file in Tom> the top-level of each branch? Jan> That would not work for merges of multiple branches. Some Jan> ARCHER.branchname would work. Ok, it turns out that --edit-description doesn't really do what we'd like. Bummer. 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 Alternatively we could pick the README file name based on the branch name. This isn't as convenient but it would also work. Tom