From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: Tom Tromey <tromey@redhat.com>
Cc: Project Archer <archer@sourceware.org>
Subject: Re: Proposal to change branch maintenance
Date: Mon, 18 Feb 2013 17:03:00 -0000 [thread overview]
Message-ID: <20130218170302.GA20180@host2.jankratochvil.net> (raw)
In-Reply-To: <87wqu5bn6s.fsf@fleche.redhat.com>
On Mon, 18 Feb 2013 17:29:15 +0100, Tom Tromey wrote:
> Jan> I already did so, where do you see them?
> Jan> archer.git "master" deletion (+branches cleanup)
> Jan> Message-ID: <20111226231836.GA32067@host2.jankratochvil.net>
> Jan> http://sourceware.org/ml/archer/2011-q4/msg00010.html
> Jan> http://sourceware.org/ml/archer/2012-q1/msg00001.html
>
> E.g., but there are really many more:
>
> barimba. git branch -r |grep origin/gdb
> origin/gdb-4_18-branch
You must have some stale local copy. Both
http://sourceware.org/git/?p=archer.git;a=heads
and fresh
git clone git://sourceware.org/git/archer.git
do not show anything other then archer-* branches.
BTW gdb.git tags were left there, that could be fixed (but I do not use tags).
> It would be possible to do other kinds of automatic merging.
> For example we could "cat" the two files together.
Yes, that would be great.
> Since you're doing most of the serious merges, how about you say which
> you'd prefer?
In fact it does not matter much as the additional work twice a year is very
minor.
But I find the 'cat' merge would be best for everyone, even for other people
occasionally possibly doing some archer branch merges.
Jan
next prev parent reply other threads:[~2013-02-18 17:03 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
2013-02-18 16:20 ` Jan Kratochvil
2013-02-18 16:29 ` Tom Tromey
2013-02-18 17:03 ` Jan Kratochvil [this message]
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=20130218170302.GA20180@host2.jankratochvil.net \
--to=jan.kratochvil@redhat.com \
--cc=archer@sourceware.org \
--cc=tromey@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).