public inbox for archer@sourceware.org
 help / color / mirror / Atom feed
From: Tom Tromey <tromey@redhat.com>
To: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Project Archer <archer@sourceware.org>
Subject: Re: Proposal to change branch maintenance
Date: Mon, 18 Feb 2013 16:10:00 -0000	[thread overview]
Message-ID: <87k3q5d2mp.fsf@fleche.redhat.com> (raw)
In-Reply-To: <20130213121556.GA21353@host2.jankratochvil.net> (Jan Kratochvil's message of "Wed, 13 Feb 2013 13:15:56 +0100")

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

  parent reply	other threads:[~2013-02-18 16:10 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-11 21:56 Tom Tromey
2013-02-13 11:32 ` Gary Benson
2013-02-13 12:16 ` Jan Kratochvil
2013-02-13 12:33   ` Pedro Alves
2013-02-13 12:53   ` Gary Benson
2013-02-18 16:10   ` Tom Tromey [this message]
2013-02-18 16:20     ` Jan Kratochvil
2013-02-18 16:29       ` Tom Tromey
2013-02-18 17:03         ` Jan Kratochvil
2013-02-18 17:40           ` Tom Tromey
2013-02-18 22:01           ` Tom Tromey
2013-02-22 15:54             ` Tom Tromey
2013-02-26 17:33     ` Tom Tromey
2013-02-26 20:13       ` Tom Tromey
2013-02-26 20:31         ` Sergio Durigan Junior
2013-02-27 20:50           ` Tom Tromey
2013-02-27 20:50         ` Tom Tromey
2013-02-27 21:15           ` Tom Tromey
2013-02-18 11:46 ` Sergio Durigan Junior
2013-02-18 16:11   ` Tom Tromey
2013-02-18 16:16     ` Jan Kratochvil
2013-02-22 15:06       ` Tom Tromey
2013-02-22 21:27 ` Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k3q5d2mp.fsf@fleche.redhat.com \
    --to=tromey@redhat.com \
    --cc=archer@sourceware.org \
    --cc=jan.kratochvil@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).