This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [c++-concepts] code review
- From: Andrew Sutton <andrew dot n dot sutton at gmail dot com>
- To: Jason Merrill <jason at redhat dot com>
- Cc: Gabriel Dos Reis <gdr at axiomatics dot org>, gcc-patches at gcc dot gnu dot org
- Date: Fri, 21 Jun 2013 07:46:18 -0500
- Subject: Re: [c++-concepts] code review
- References: <CANq5Syt5s-NgazOYbT5wtYSRsbZUqcivoer1w4jiucx5qYKMfA at mail dot gmail dot com> <51B62961 dot 1080409 at redhat dot com> <CAAiZkiDY5LZRwgEAmc1VPhbMXJ1ytU_Q2Fj9tSyN1M_T7NMMfw at mail dot gmail dot com> <51B8A36C dot 1080005 at redhat dot com> <CANq5SyuWOKxWshSBb8uxtN8d6HMgifJdDcQSrsSwazRjE=v2NQ at mail dot gmail dot com> <51BBC613 dot 5040708 at redhat dot com> <CANq5SysgoJ0nVdrqLMjFqaWcmz97dB03qbKCs_ZpoBS+OVYzfg at mail dot gmail dot com> <51BF617D dot 3080101 at redhat dot com> <CANq5SyshsCtsQgGvCj6hVexa4m-st0-yM1PpLq=R68YXkfz_aw at mail dot gmail dot com> <51C1BE59 dot 6040400 at redhat dot com> <CAAiZkiDBrBMhRf-6w6dH1Yh7m6pOoJFEor38mcWKgtbzVXLhVA at mail dot gmail dot com> <51C2FD43 dot 8090209 at redhat dot com> <87bo716ia0 dot fsf at euclid dot axiomatics dot org> <CANq5SysuEbi34bd-05JsyiM4quYt7LevLd=zXinxvFAhnvEXGg at mail dot gmail dot com> <51C30A3C dot 2040907 at redhat dot com> <CANq5SyssNx96LxY2fe7_8QHVLCit2GMT3euZ4XJP2Z8Yx9cJaA at mail dot gmail dot com> <51C31CEA dot 2040208 at redhat dot com> <CANq5SysxuOU+uUEQHtECDdc3w60ubpr8DKqy+Z1qs4ki_RgX1A at mail dot gmail dot com> <51C33A9D dot 60804 at redhat dot com> <51C34AFD dot 4050008 at redhat dot com>
I think I will continue to work from SVN branches, because I'm a lot
more familiar with that process. I'm also going to start working on a
couple of different checkouts of the c++-concepts branch
independently, so this should be a little easier for me.
I can move those patches over to git and push the changes in separate
branches in addition to the usual submission mechanism. Would that be
appropriate? Can I create a bunch of different git branches for small
feature sets?
Andrew
On Thu, Jun 20, 2013 at 1:33 PM, Jason Merrill <jason@redhat.com> wrote:
> On 06/20/2013 01:23 PM, Jason Merrill wrote:
>>
>> Since Gaby prefers SVN, let's keep using the SVN branch; it really isn't
>> much less convenient than a git-only branch. The main difference is
>> 'git svn rebase'/'git svn dcommit' instead of 'git pull'/'git push'.
>
>
> The one caveat is that git-svn historically hasn't handled merges very well.
> I think git-svn v1.8.3 or newer can do the right thing, but I haven't tested
> it, so it's probably best to keep doing merges with the svn client for the
> time being.
>
> Jason
>
--
Andrew Sutton
andrew.n.sutton@gmail.com