Hi Sergei,
> 1. Ok, please allow a few days for realization and testing.
sure - we are currently not exactly on the fast lane, as well ;-)
A side note: your job could possibly made much easier with - again - Git. Some
examples taken straight from the top directory of my current OpenXPKI repo:
** Get overall head revision:
$ git log -1 | cat
commit d25eb8c2ddd04b2392bf377c6614bdb1430bf3c2
Author: svysh <svysh@95d9436f-6502-0410-902c-bd9569d1a17e>
Date: Mon Sep 12 18:40:53 2011 +0000
More fix related to removal of refs to Last Midnight generator
git-svn-id: https://openxpki.svn.sourceforge.net/svnroot/openxpki@1582
95d9436f-6502-0410-902c-bd9569d1a17e
** Get "last changed revision" for, say, trunk/deployment:
$ git log -1 trunk/deployment/ | cat
commit 2601f0152ed10e4451a1348518c468f516b07db6
Author: jatty <jatty@95d9436f-6502-0410-902c-bd9569d1a17e>
Date: Mon Aug 8 13:22:54 2011 +0000
appropriate return code for /etc/init.d/openxpki
git-svn-id: https://openxpki.svn.sourceforge.net/svnroot/openxpki@1566
95d9436f-6502-0410-902c-bd9569d1a17e
Hope this helps.
Thinking of it, it should also be possible to include this in vergen.
Unfortunately I currently have absolutely no time to work on that for the next
two weeks or so.
> 2. During present transitional period, svn and git repositories are
> fully independent?
> Or you established some sort of automation?
> Shall I manually double commits to both svn and git?
> Same credentials for git?
Git does a very good job of synchronizing to a SVN repo with a git repo. In
fact what we have been doing here for the past two or three years was to use
link a git branch with a SVN remote repo.
In .git/config of my Oxi git repo I have:
[svn-remote "svn"]
url = https://[email protected]/svnroot/openxpki
fetch = :refs/remotes/git-svn
** Git equivalent of "svn update":
To update my local master branch (which follows the Subversion repo) I do:
$ git checkout master
(master)$ git svn rebase
Current branch master is up to date.
If SVN is ahead of my local branch, this command will pull any changes in my
local branch, they will look like Git commits with a somewhat special commit
message.
** Git equivalent of "svn commit":
If I have changes to commit to Subversion, first I include them locally in my
master branch. (Git allows one to do this e. g. via cherry-picking or rebasing.
It is also possible to merge in changes, but this messes with the history in a
SVN-unfriendly way. I made this mistake once recently. This causes no problems,
but looks a bit strange). It is important NOT to push the master branch in this
state to another git remote repository, because the next step will rewrite the
commit history for the new commits I wish to contribute to SVN:
... do some work, e. g. git cherry-pick, git rebase...
... Head now contains some commits I would like to commit to SVN...
$ git svn dcommit
After this command returns it will have committed all new commits as individual
SVN commits to the remote SVN repo. It will also have rewritten the local
commits since the last git svn synchronization.
Now SVN and Git on SF are simply kept in sync manually: after a "git svn
dcommit" I immediately push my master branch to the SF Git repo. If somebody
else modifies the SVN but not Git, I can perform the update for them:
git svn rebase
git push sourceforge # (sourceforge being the name of the remote git repo
on SF)
Hope this helps...
> 3. www5 ignores changes of the web zone at svn. See e.g.
>
> http://www5.openxpki.org/download/index.html
>
> Or shall we lassen das in Ruhe?
I'd say, leave it. As I said, we shall move the web page to SF eventually.
Cu
Martin
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
OpenXPKI-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openxpki-devel
