From: Eric Wong <normalperson@yhbt.net>
To: "Frédéric Heitzmann" <frederic.heitzmann@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] git svn : hook before 'git svn dcommit'
Date: Wed, 17 Aug 2011 13:37:01 -0700 [thread overview]
Message-ID: <20110817203701.GB24581@dcvr.yhbt.net> (raw)
In-Reply-To: <CALeToSUidWgiJ+PxuphnBZOQGNStNOO9==EswfLDpFr2GYy=nA@mail.gmail.com>
Frédéric Heitzmann <frederic.heitzmann@gmail.com> wrote:
> 4) Before merging back to master and commitng to SVN, it is necessary
> to remove commits with reference data (git rebase -i --onto master
> master topic ...)
> 5) merge topic branch with master and git svn dcommit
>
> -- end --
>
> It is very easy to forget step 4, and svn commit lots of useless data.
I agree.
> Proposal 1)
> * commit reference data with some specific mark in the commit message
> (e.g. "NO_SVN")
> * use pre-svn-dcommit hook to detect such commits
The problem with this is hook standardization across committers and even
across different machines/directories a committer may use.
> Proposal 2) (not fully feasable for what I know)
> * git svn clone to a bare repo
> * clone a working repo from the the bare repo.
> * steps 2, 3, maybe 3bis, ... then 4
> * push commits to the bare repo, while using pre-receive or update
> hook to look for wrong commits, and abort if so.
> * use post-receive hook to trigger git svn dcommit
>
> Main drawback for proposal 2 (appart from needing 2 repo instead of
> one) is that each time you want to update your working repo, you have
> to git svn rebase the bare repo, then git pull.
Proposal 2 is way too complicated, I hate it.
> All things begin equal, proposal 1 seems to be the easier path, but it
> is highly debatable.
I had Proposal 3 in my original response:
> 2011/8/17 Eric Wong <normalperson@yhbt.net> wrote:
> > Perhaps an interactive option for dcommit would be just as useful?
1 and 3 can both implemented, but I think 3 would be easier to
use/setup/standardize. I suspect it's also easier to train oneself to
always use "dcommit -i". Perhaps even default to interactive mode
like git-send-email does nowadays.
Unfortunately interactive dcommit requires more effort to implement.
--
Eric Wong
next prev parent reply other threads:[~2011-08-17 20:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-15 20:04 [PATCH v2] git svn : hook before 'git svn dcommit' Frédéric Heitzmann
2011-08-15 21:14 ` Junio C Hamano
2011-08-17 0:30 ` Eric Wong
[not found] ` <CALeToSWJNK=q4iPwxNvgGin0T61oLKJd=b9F3cSSo0vVebrhhQ@mail.gmail.com>
2011-08-17 14:35 ` Frédéric Heitzmann
2011-08-17 20:37 ` Eric Wong [this message]
2011-08-18 13:43 ` Frédéric Heitzmann
2011-08-20 18:41 ` Eric Wong
2011-08-18 9:12 ` Peter Baumann
2011-09-01 16:58 ` Paul Young
-- strict thread matches above, loose matches on Subject: below --
2011-07-04 5:54 [PATCH] " Frédéric Heitzmann
2011-07-05 20:44 ` [PATCH v2] " Frédéric Heitzmann
2011-07-09 12:18 ` Frédéric Heitzmann
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110817203701.GB24581@dcvr.yhbt.net \
--to=normalperson@yhbt.net \
--cc=frederic.heitzmann@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).