Hello,
I have just started using git, so I don't have a lot of experience on
it, and I also haven't used it in a distributed environment, just as
a single developer on one of my personal projects.
Now I'm trying to use git at work through git-svn. git-svn cloned the
Subversion repository okay, and using git and dcommitting to
Subversion also works fine. The problems started when i tried to use
the git-svn repository in a distributed fashion.
Here's the thing: I'm developing a server software, locally and on a
pre-production server. The pre-production test server (just called
the server for now on) is on a DMZ network, which cannot access our
Subversion server. So I thought I could push the git repository to
the server to update the code, which works fine too. But sometimes
when there is a problem, I'll just develop the fix on the server
itself, instead of on my laptop (local development). I would like to
be able to pull the changes made on the server, back to my laptop,
and dcommit it to the Subversion server from there.
The problem is, that git-svn changes all the commits, and pushing to
the server repository won't work anymore. I can force a push, but
then there will be two commits per every commit pulled from the server.
I have thought about using two branches on the server, master, which
will only include commits already processed through git-svn, and dev,
which is used to pull the "local" changes to be committed to
Subversion. But my inexperience with git got me here, and I can't
seem to be able to get any updates from the other branch. And I'm not
even sure if this is the right approach to this problem.
What kind of approach/workflow would you use in a similar situation?
Regards,
Väinö Järvelä-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
