Git development
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Steve Fr?cinaux <nudrema@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC] git-svn: make git-svn commit-diff able to work without explicit arguments
Date: Tue, 2 Jan 2007 11:18:10 -0800	[thread overview]
Message-ID: <20070102191810.GA18856@localdomain> (raw)
In-Reply-To: <459AA31E.5070705@gmail.com>

Steve Fr?cinaux <nudrema@gmail.com> wrote:
> Hello,
> 
> When using git-svn to access a SVN repo, the commit policy may vary. 
> While git makes you commit small patches often, svn users tend to prefer 
> bigger patches that implement a functionnality at once.
> 
> So at the end you have a SVN commit which corresponds to several git ones.
> 
> What you can do in this case is :
> 
>   git-svn commit-diff --edit -r$REV remotes/git-svn HEAD
> 
> Which effect is that it commits (at once) all the commits between the 
> latest svn fetch and HEAD.
> 
> What I'm proposing here is this:
> 
>  - use the latest fetched rev the default for the -r argument.

Yes, this is very important.

>  - use remotes/git-svn and HEAD the defaults for the treeish objects.
> 
> A smarter way to take these defaults would be to take the last revision 
> in the current branch (which can be something else than git-svn if it 
> wasn't rebased/merged recently) and the relevant commit in the current 
> branch.
> 
> Additionnaly, --edit could be enabled by default if -m is not set and it 
> is used interactively, eventually using an option in repo-config.

This sounds useful.  This is basically what 'set-tree' (the command
formerly known as 'commit') was meant to do originally.  Unlike 
set-tree (or perhaps with modifying set-tree), this should
rebase or reset afterwards to linearize history like 'dcommit'.

-- 
Eric Wong

  parent reply	other threads:[~2007-01-02 19:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-02 18:23 [RFC] git-svn: make git-svn commit-diff able to work without explicit arguments Steve Frécinaux
2007-01-02 18:40 ` [RFC] " Pierre Habouzit
2007-01-02 19:18 ` Eric Wong [this message]
2007-01-02 20:30 ` [RFC] " Junio C Hamano
2007-01-02 21:13   ` [RFC] " Pierre Habouzit
2007-01-02 21:26     ` Brian Gernhardt
2007-01-02 21:58       ` Jakub Narebski
2007-01-02 22:27         ` Pierre Habouzit
2007-01-02 22:01     ` Junio C Hamano
2007-01-02 23:09     ` Steve Frécinaux

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=20070102191810.GA18856@localdomain \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=nudrema@gmail.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