[yast-devel] Switching from SVN to GIT
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, We are currently working on a proposal for moving our SVN [#1] repository to several GIT [#2] repositories at GitHub [#3]. Everything should be described in on-line document "YaST svn2git" at Google Docs [#4]. We'd like to hear from you what else needs to be taken into consideration before we do the switch. #1 http://subversion.tigris.org/ #2 http://www.kernel.org/pub/software/scm/git/docs/ #3 https://github.com/ #4 https://docs.google.com/document/d/1vzFly6-xhBHy3s4O4n04Q35mSHofwMpOHfLwgdRDU00/edit?hl=en_US&pli=1 Thanks and Bye Lukas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk4cNLgACgkQVSqMdRCqTixoTwCeI7dEC/+E3qiPJPEs2Mek8Yqk nK8AnjdUlYmr3knZe+S8TTch/FMDipuF =TcFg -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
Dne Út 12. července 2011 13:49:12 Lukas Ocilka napsal(a):
Hi,
We are currently working on a proposal for moving our SVN [#1] repository to several GIT [#2] repositories at GitHub [#3].
Everything should be described in on-line document "YaST svn2git" at Google Docs [#4].
We'd like to hear from you what else needs to be taken into consideration before we do the switch.
1. Adaptation of y2tools. Some is mentioned on the docs page, I'd add also others used by me: y2tool oscsubmit, y2tool y2makepot 2. Think about the commit emails. I consider the mails being sent to yast-commit@opensuse.org as ideal. With webyast in git, we do not have equally good solution (there's RSS or web). It is possible to hook "Email" service hook, but does anyone know how the mail look like? Jiri -- Jiri Suchomel SUSE LINUX, s.r.o. e-mail: jsuchome@suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Praha 9, Czech Republic http://www.suse.cz -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
Dne 13.7.2011 10:54, Jiri Suchomel napsal(a): [...]
2. Think about the commit emails. I consider the mails being sent to yast-commit@opensuse.org as ideal. With webyast in git, we do not have equally good solution (there's RSS or web). It is possible to hook "Email" service hook, but does anyone know how the mail look like?
GitHub has several hooks, one of them is email target. Unfortunately it does not send the full diff in the commit notification, see the example at the end of this mail. But the hooks are open source (see https://github.com/github/github-services), we could possibly enhance the email hook. Another solution would be to send the messages to a dedicated email proxy which would process the incoming messages (add the diff) and then resend to a mailing-list. GitHub email example: ------------------------------------------------------------------------ Branch: refs/heads/master Home: https://github.com/webyast/rest-service Commit: 4e737144fd4cf7c18a6b42dada28f3745536de8d https://github.com/webyast/rest-service/commit/4e737144fd4cf7c18a6b42dada28f... Author: Stefan Schubert <schubi@suse.de> Date: 2011-06-16 (Thu, 16 Jun 2011) Changed paths: M plugins/software/app/models/patch.rb M plugins/software/package/webyast-software-ws.changes Log Message: ----------- accepting more than one EULA in a patch (bnc#698416) Commit: 90ef75342066aa698dfb1801f3d4438ad9ecb7a8 https://github.com/webyast/rest-service/commit/90ef75342066aa698dfb1801f3d44... Author: Ladislav Slezak <lslezak@novell.com> Date: 2011-07-12 (Tue, 12 Jul 2011) Changed paths: M README Log Message: ----------- README - update WebYaST home page URL Commit: 3ea100aaa138f9093f82df7fc8ed2688585abbb3 https://github.com/webyast/rest-service/commit/3ea100aaa138f9093f82df7fc8ed2... Author: Ladislav Slezák <lslezak@suse.cz> Date: 2011-07-12 (Tue, 12 Jul 2011) Changed paths: M README Log Message: ----------- Merge pull request #1 from lslezak/master Updated opensuse wiki URL Compare: https://github.com/webyast/rest-service/compare/8145eb1...3ea100a -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dne 13.7.2011 11:23, Ladislav Slezak napsal(a):
Dne 13.7.2011 10:54, Jiri Suchomel napsal(a): [...]
2. Think about the commit emails. I consider the mails being sent to yast-commit@opensuse.org as ideal. With webyast in git, we do not have equally good solution (there's RSS or web). It is possible to hook "Email" service hook, but does anyone know how the mail look like?
GitHub has several hooks, one of them is email target. Unfortunately it does not send the full diff in the commit notification, see the example at the end of this mail.
But the hooks are open source (see https://github.com/github/github-services), we could possibly enhance the email hook.
Another solution would be to send the messages to a dedicated email proxy which would process the incoming messages (add the diff) and then resend to a mailing-list.
I've added this piece of information to that document, and linked this thread from there. Bye Lukas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk4dqawACgkQVSqMdRCqTiza2gCfff0T7KbPeDjT6+ttW/9rcF/d PdQAn1vXVCIxfbNFlHbmlaF+gQhjrCDk =Iyy3 -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
On Wednesday, July 13, 2011 11:23:10 AM Ladislav Slezak wrote:
Dne 13.7.2011 10:54, Jiri Suchomel napsal(a): [...]
2. Think about the commit emails. I consider the mails being sent to yast-commit@opensuse.org as ideal. With webyast in git, we do not have equally good solution (there's RSS or web). It is possible to hook "Email" service hook, but does anyone know how the mail look like?
GitHub has several hooks, one of them is email target. Unfortunately it does not send the full diff in the commit notification, see the example at the end of this mail.
DISCLAIMER: url below is SUSE-internal, sorry For our internal git server I created a custom email hook that we are using for several projects that switched from svn to git and wanted to have full diffs in the commit mails: http://git.suse.de/git-suse-de/commit-mail After a cleanup I think we could use it for our public repos as well. Example from SMT repo: ===== snip ============================================================ The branch_SMT11 branch has been updated via 1b089ec78daac9eea28dfe977afbd43bd144a3ae (commit) from a971c1b0f775da2934eb869c51c09f9357401397 (commit) -- Git log ------------------------------------------------------------ commit 1b089ec78daac9eea28dfe977afbd43bd144a3ae Author: Foo Bar <foo@bar.com> Date: Tue Jun 11 11:22:33 2011 +0200 fix bug #123456 -- Summary ------------------------------------------------------------ package/foopkg.changes | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) -- Git diff ----------------------------------------------------------- diff --git a/package/foopkg.changes b/package/foopkg.changes index aa4521f..cb1ab02 100644 --- a/package/foopkg.changes +++ b/package/foopkg.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 11 11:10:10 CEST 2011 - foo@bar.com + +- fix ABC +- fix DEF +- improve GHI + +------------------------------------------------------------------- Mon Feb 10 11:22:33 UTC 2011 - barbar@bar.com - fixed nothing ======================================================================= Ciao, Daniel -- J. Daniel Schmidt <jdsn@suse.de> SUSE LINUX Products GmbH Research & Development Maxfeldstr. 5 HRB 16746 (AG Nürnberg) D-90409 Nürnberg GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dne 13.7.2011 10:54, Jiri Suchomel napsal(a):
1. Adaptation of y2tools. Some is mentioned on the docs page, I'd add also others used by me: y2tool oscsubmit, y2tool y2makepot
2. Think about the commit emails. I consider the mails being sent to yast-commit@opensuse.org as ideal. With webyast in git, we do not have equally good solution (there's RSS or web). It is possible to hook "Email" service hook, but does anyone know how the mail look like?
Thanks, added to the document. Lukas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk4dqI4ACgkQVSqMdRCqTiyhlACfa10OsASNVLtMu2PxNsGEdg+e b78AnR4gP9DaySaVtbRK/QGsAshYGm9H =IebX -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
Hi, Klaus and Daniel created a tool for migrating the SVN repository via 'svnadmin dump' and splitting that up into smaller SVN repositories which are then fed into svn-all-fast-export The setup is at https://github.com/kkaempf/yast-svn2git I have tried it on the network module, and the export ends at revision 27004, apparently because it fails to bring in a file that was moved from elsewhere: http://svn.opensuse.org/viewvc/yast?view=revision&revision=27004 Another thing, the original revision numbers are lost. I frequently refer to them in commit messages and Bugzilla, so I think they need to be preserved somehow. Hmm, have we just reinvented svndumpfilter? http://svnbook.red-bean.com/en/1.5/svn.ref.svndumpfilter.commands.c.include.... Or svndumpfilter2 ? http://blog.janjonas.net/2010-02-16/svndumpfilter-svndumpfilter2-extract-svn... -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu
* Martin Vidner <mvidner@suse.cz> [Jul 25. 2011 16:14]:
Hi,
Klaus and Daniel created a tool for migrating the SVN repository via 'svnadmin dump' and splitting that up into smaller SVN repositories which are then fed into svn-all-fast-export The setup is at https://github.com/kkaempf/yast-svn2git
I have tried it on the network module, and the export ends at revision 27004, apparently because it fails to bring in a file that was moved from elsewhere: http://svn.opensuse.org/viewvc/yast?view=revision&revision=27004
Yes, this didn't show up in the initial tests but I found and fixed it over the weekend. Its a dirty, but working hack ...
Another thing, the original revision numbers are lost. I frequently refer to them in commit messages and Bugzilla, so I think they need to be preserved somehow.
They are, as part of the git commit message.
Hmm, have we just reinvented svndumpfilter? http://svnbook.red-bean.com/en/1.5/svn.ref.svndumpfilter.commands.c.include....
We tried with svndumpfilter but failed. Daniel might still have a link with the explanation of what went wrong.
Or svndumpfilter2 ? http://blog.janjonas.net/2010-02-16/svndumpfilter-svndumpfilter2-extract-svn...
Good catch, haven't heard about this before ! But it seems to suffer from the same problem we had with svndumpfilter: rinse and repeat - you have to manually collect all missing links, which are plenty for some YaST modules. Klaus --- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5, 90409 Nürnberg, Germany -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
On Mon, Jul 25, 2011 at 08:33:42PM +0200, Klaus Kaempf wrote:
Another thing, the original revision numbers are lost. I frequently refer to them in commit messages and Bugzilla, so I think they need to be preserved somehow.
They are, as part of the git commit message.
No, the git commit message has the revision numbers of the *filtered* repository. It seems the svndump format allows sparse revision sequences, so simply preserving the revision number during the filtering would work. -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu
* Martin Vidner <mvidner@suse.cz> [Jul 26. 2011 15:42]:
On Mon, Jul 25, 2011 at 08:33:42PM +0200, Klaus Kaempf wrote:
Another thing, the original revision numbers are lost. I frequently refer to them in commit messages and Bugzilla, so I think they need to be preserved somehow.
They are, as part of the git commit message.
No, the git commit message has the revision numbers of the *filtered* repository. It seems the svndump format allows sparse revision sequences, so simply preserving the revision number during the filtering would work.
Right, the filter process is not the issue. The renumbering is cause by the 'svnadmin load' into a new svn repo for svn-all-fast-export to work. :-( Klaus --- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5, 90409 Nürnberg, Germany -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
Lukas Ocilka write:
Hi,
We are currently working on a proposal for moving our SVN [#1] repository to several GIT [#2] repositories at GitHub [#3].
Everything should be described in on-line document "YaST svn2git" at Google Docs [#4].
We'd like to hear from you what else needs to be taken into consideration before we do the switch.
#1 http://subversion.tigris.org/ #2 http://www.kernel.org/pub/software/scm/git/docs/ #3 https://github.com/ #4 https://docs.google.com/document/d/1vzFly6-xhBHy3s4O4n04Q35mSHofwMpOHfLwgdRDU00/edit?hl=en_US&pli=1
Thanks and Bye Lukas
Hi, what is current status of project? For adapting scripts or creating new one I think that we can reuse rake tasks we have for webyast ( also one of workshop project to reuse this tasks ) like making pot, taging, obs submit etc. How can I help with it as I see move to git as good step, especially when I can compare experience after perl-Bootloader switch. Josef -- Josef Reidinger Appliance Toolkit team maintaining parts of webyast and SLMS author of rubygems - studio_api and net_observer (coauthor) -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org
participants (7)
-
J. Daniel Schmidt -
Jiri Suchomel -
Josef Reidinger -
Klaus Kaempf -
Ladislav Slezak -
Lukas Ocilka -
Martin Vidner