headers
Sergei Vyshenski | 10 Feb 10:20
Picon

git and svn

Hi Martin,

Sorry for hitting this point again, but lastmidnight generator is stuck:

http://www7.openxpki.org/lastmidnight/index.html

For use with lastmidnight generator
I have a working copy of a "git snapshot" which was created with a command:

git clone git://openxpki.git.sourceforge.net/gitroot/openxpki/openxpki

To update this snapshot nightly from a SF repository I used to issue
command:

git svn rebase

which now says:

Unable to determine upstream SVN information from working tree history

What is a methodical way to update my git snapshot?

All the best, Sergei

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
(Continue reading)

Permalink | Reply |
headers
Martin Bartosch | 10 Feb 10:26
Picon

Re: git and svn

Hi Sergei,

> For use with lastmidnight generator
> I have a working copy of a "git snapshot" which was created with a command:
> 
> git clone git://openxpki.git.sourceforge.net/gitroot/openxpki/openxpki
> 
> To update this snapshot nightly from a SF repository I used to issue
> command:
> 
> git svn rebase
> 
> which now says:
> 
> Unable to determine upstream SVN information from working tree history

Try the following: enter the top level of the repository tree. You should find a directory .git in this directory.

Edit .git/config

Check if you have got a section that looks like this:

[svn-remote "svn"]
        url = https://mbartosch-V/rW0nbxQoA7kfSZdNC4/qQD96bmaF075NbjCUgZEJk <at> public.gmane.org/svnroot/openxpki
        fetch = :refs/remotes/git-svn

If this does not exist, add it. Replace the user name with yours on SF or replace the URL with the read-only SVN
base URL.

Once you have done this the command "git svn rebase" should work properly.
(Continue reading)

Permalink | Reply |
headers
Sergei Vyshenski | 10 Feb 10:45
Picon

Re: git and svn

My .git/config was as follows (which seems in accord with your advice):

==================================================
[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url =
ssh://svysh@.../gitroot/openxpki/openxpki
[branch "master"]
        remote = origin
        merge = refs/heads/master
[svn-remote "svn"]
        url = https://svysh-V/rW0nbxQoA7kfSZdNC4/qQD96bmaF075NbjCUgZEJk <at> public.gmane.org/svnroot/openxpki
        fetch = :refs/remotes/git-svn
==================================================

>From which directory the command "git svn rebase" should be given?

If I give it from the top level of the repository (which has .git) in
it, then it ends with

"Unable to determine upstream SVN information from working tree history"

If I give it from within .git directory, it says that virtualy
everything needs update like this:
(Continue reading)

Permalink | Reply |
headers
Sergei Vyshenski | 10 Feb 15:15
Picon

Re: git and svn

Hi Martin,

Can we forget about svn for a moment.
Say I have a git snapshot created in September with read-only access to
SF server:

git clone git://openxpki.git.sourceforge.net/gitroot/openxpki/openxpki

This created and populated directory "openxpki" with .git inside it.

Could you recommend how I can actualize this snapshot today for the
needs of lastmidnight generation?

If I just say:

cd openxpki
git rebase

It says "Current branch master is up to date",
which is not true, considering results of

git log -1

which gives dates from September.

The only (known to me) solution which effectively updates my snapshot is:

rm -rf openxpki
git clone git://openxpki.git.sourceforge.net/gitroot/openxpki/openxpki
(Continue reading)

Permalink | Reply |
headers
Sergei Vyshenski | 10 Feb 15:47
Picon

Re: git and svn

Issue resolved, case closed.
Sorry for spamming the list.

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
Permalink | Reply |
headers
Martin Bartosch | 10 Feb 15:51
Picon

Re: git and svn

Hi Sergei,

> Issue resolved, case closed.

No worries. If anybody else has the same problem:

git pull

updates the current branch from the origin repo. Precondition: git config has the local branch configured
to merge the remote branch (which is normally the case for master).

Otherwise 

git fetch

will update your remote tracking branches, but it will leave your local branch unchanged.

See also: git-pull(1), git-fetch(1), git-rebase(1)

cu

Martin

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
Permalink | Reply |

Gmane