From: Miles Bader <miles@gnu.org>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Raymond Auge <raymond.auge@liferay.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: are hashes calculated from data
Date: Fri, 02 Apr 2010 13:22:31 +0900 [thread overview]
Message-ID: <buozl1mbi0o.fsf@dhlpc061.dev.necel.com> (raw)
In-Reply-To: <o2q32541b131004011950u6023ef29ocac1d80f2847ef6f@mail.gmail.com> (Avery Pennarun's message of "Thu, 1 Apr 2010 22:50:06 -0400")
Avery Pennarun <apenwarr@gmail.com> writes:
> You can minimize the impact of this problem, however. The easiest way is:
>
> - have only a single person use git-svn
>
> - when committing stuff to git-svn, first checkout the *existing*
> git-svn branch, then use "git merge --no-ff mybranch", then "git svn
> dcommit". The --no-ff is very important; this makes sure that a *new*
> commit is created (a merge commit) for the svn dcommit. svn dcommit
> then creates only a single svn commit that includes all the patches
> from the whole branch.
>
> - then do 'git checkout mybranch; git merge git-svn' to get the svn commit back.
>
> At work, we have a cronjob that basically does most of these steps for
> us. Then there's a central git repo that corresponds to the svn repo;
> people who want to use git can use that repo and not worry about
> git-svn.
Do you happen to have the cron script available for perusal anywhere?
I imagine many of the details would need to be changed for other
installations, but just looking at a working concrete example could be
very helpful...
Thanks,
-Miles
--
=====
(^o^;
(()))
*This is the cute octopus virus, please copy it into your sig so it can spread.
next prev parent reply other threads:[~2010-04-02 4:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-02 2:31 are hashes calculated from data Raymond Auge
2010-04-02 2:50 ` Avery Pennarun
2010-04-02 4:22 ` Miles Bader [this message]
2010-04-02 4:48 ` Avery Pennarun
2010-04-02 6:10 ` Peter Baumann
2010-04-02 6:49 ` Avery Pennarun
2010-04-02 7:08 ` Peter Baumann
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=buozl1mbi0o.fsf@dhlpc061.dev.necel.com \
--to=miles@gnu.org \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=raymond.auge@liferay.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.