From kde-core-devel  Fri Jul 13 17:43:52 2007
From: "Boyd Stephen Smith Jr." <bss03 () volumehost ! net>
Date: Fri, 13 Jul 2007 17:43:52 +0000
To: kde-core-devel
Subject: Re: KDE development with git
Message-Id: <200707131243.52262.bss03 () volumehost ! net>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=118434868020429
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--nextPart15000945.KNHqPrAO1B"

--nextPart15000945.KNHqPrAO1B
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Friday 13 July 2007, Paolo Capriotti <p.capriotti@gmail.com> wrote=20
about 'Re: KDE development with git':
> So, if you have some ideas on how to set [bi-directional SVN/git gateway]
> up, any help is appreciated.

My idea would be synchronize by using a private branch that was the only=20
one rebased.  Maybe a cron job to do something like the following.

1) Create a new branch "gateway" off of master.
2) Rebase "gateway" onto the git-svn brach.  (Might have to call for human=
=20
help here.)
3) Dcommit "gateway" to the SVN server.
4) Rebase "gateway" onto master. (Again, might have to call for help here.)
5) Push "gateway" to master.

You start with something like:

  B--E <-- master
 /
A-C--D <-- git-svn

git checkout master
git branch gateway
git rebase --onto git-svn A

To get:

  B--E <-- master
 /
A-C--D <-- git-svn
      \
       B'--E' <- gateway

Now the dcommit can do a series of fast-forward commits.  Once it's done,=20
you have:

  B--E <-- master
 /
A-C--D--B'--E' <-- git-svn, gateway

git rebase --onto master A

Results in:
       C'--D'--B''--E'' <-- gateway
      /
  B--E <-- master
 /   =20
A-C--D--B'--E' <-- git-svn

B'' and E'' might be empty. Now the push to master is also fast forward. =20
This does result in some patch order inversion in git vs. svn but if the=20
script runs often enough that should be minimal.

Also, rather than the script going all the way back to the original branch=
=20
point ("A"), it only needs to go to the last time master was sync'd from=20
svn.

=2D-=20
Boyd Stephen Smith Jr.                     ,=3D ,-_-. =3D.=20
bss03@volumehost.net                      ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy           `-'(. .)`-'=20
http://iguanasuicide.org/                      \_/    =20

--nextPart15000945.KNHqPrAO1B
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)

iD8DBQBGl7nY55pqL7G1QFkRAhHTAKCBpHahiEC3opJCL0WIrstyIh0wjACdE5+X
42GeMiGNBxxeavm2HUVkpKE=
=5Y6X
-----END PGP SIGNATURE-----

--nextPart15000945.KNHqPrAO1B--