git-svn

Migrating from Subversion to Git how can I find a commit given a revision number?

Migrating from Subversion to Git using svn2git (which internally uses git-svn) I'd like to know how I can find a specific revision commit. It is quite common to have issues tracker to have comments like: "Fixed in r12345". Given this, I'd like to be able, for example, to extract the diff corresponding to r12345. Thanks in advance. Re...

git: correct way to merge/rebase with respect to svn dcommit

I have the following situation (mostly because I didn't really thought it through in the beginning -- or more exactly, I thought it shouldn't be a problem the way I did this but now I am stumbled): ... --- A --- B1 --- ... --- Bn ... --- git-svn Whereby A and git-svn are at the same state (exactly the same files and file content) but...

Recover history from foolish git-svn merge

the players: master: the svn branch (actual, not local trackign) mybranch: a local branch My mistake: [master] git svn rebase [master] git merge mybranch [master] git svn dcommit I did this twice. Is there a way I can remedy all this? I was thinking something like: git checkout --hard [commit before the merging] git dcommit # ...

What does this svn2git error mean?

I am trying to import my repository from svn to git using svn2git, but it seems like it's failing when it hits a branch. What's the problem? Found possible branch point: https://s.aaa.com/repo/trunk/project => https://s.aaa.com/repo/branches/project-beta1.0, 128 Use of uninitialized value in substitution (s///) at /opt/local/libexec/git...

Using git-svn with slightly strange svn layout

Hi guys, I'm doing an internship and they are using SVN (although there has been some discussion of moving to hg or git but that's not in the immediate future). I like git so I would like to use git-svn to interact with the svn repository and be able to do local commits and branches and stuff like that (rebasing before committing to svn ...

Git to svn: Adding commit date to log messages

How should I do to have the author (or committer) name/date added to the log message when "dcommitting" to svn? For example, if the log message in Git is: This is a nice modif I'd like to have the message in svn be something like: This is a nice modif ----- Author: John Doo <[email protected]> 2010-06-10 12:38:22 Committer: Nice...

How to import a svn repository underneath a git repository?

Hi there, I have a svn repository that I migrated to git using the tool svn2git. Now I would like to push this git layout to a remote repository underneath an existing directory. But, I would like to keep the svn history (tags and branches). For instance: Git remote repository layout: git-repository/dirA git-repository/dirB git-...

Could git do not store history of specific folders when working with git-svn?

In short: Is there a way to disable storing full history for specific folders in git-svn repo? We have pretty large SVN repo with big checkout. I would like to migrate it to Git for my local development, because Git speeds up update and status commands orders of magnitude. When I simply do git svn clone it creates very big repo. Big en...

Importing Subversion to GIT: problem with subpaths

We currently run a big subversion repository, and I'm trying to move it to GIT. The problem is that it uses trunks and tags below the root directory. For example: MyDepartment\MyOS\Project1\trunk\ <-- master branch MyDepartment\MyOS\Project1\branch\v1 <-- other branch MyDepartment\MyOS\Project1\tags\v1_20100101 ...

git svn dcommit error: unable to determine upstream SVN information

hi there I m trying out git svn and I m getting this error Waht I ve done so far is git svn init -T <my svn repo> then I ve been committing to my git repo with git commit -a then once i did a few of those I did a git svn fetch and then i tried a git svn dcommit however, that fails with Unable to determine the upstr...

Git-svn: managing mutiple remote tracking branchs

Hi all, Currently I'm trying out exporting Git repository history into svn via git-svn and using grafts method. As of now, I have successfully export the git history into svn. But because of the grafting method and that my git repository is cloned from the actual repository, I ended up having TWO remote branches like that of below. o-...

Needing a git-svn workflow suggestion to keep personal files away from svn

I am starting to read about git-svn now to use it with a project that use SVN. I would like to have some files just for me (todo files, scratch code, etc), and I will like to keep track of them in the Git repository. Is it possible to have some files in the Git but not in the SVN repository? I though about having a branch master that w...

git svn: password for svn is not stored

I'm using git against a central remote svn repository using 'git-svn'. The SVN repository uses https with a self-signed certificate. Everything works fine, with one nasty exception. As long as I use directly with svn, the password is remembered, so it has to by typed only on the first command. When using git-svn operations (e.g. dcommi...

Revert a commit file

Hi, In my repository I got 2 branch when using git-svn $ git branch -a * master remotes/git-svn Now I can see the diff with $ git diff --name-status remotes/git-svn M global/library/Exception.php How can I revert the modification? Thanks ...

Why are git submodules incompatible with svn externals?

There are lots of webpages out there suggesting hackish ways to make svn externals look like git submodules. I have read some accounts of what the difference is, but this doesn't seem very fundamental: Git submodules link to a particular commit in another project's repository, while svn:externals always fetch the latest revision. W...

Unable to extract revision information from commit

Just noticed a scary problem with git svn (git version 1.6.5.2). First commiting my work as normal with git commit, when finished I did git svn dcommit. This started fine with Resetting to the latest refs/remotes/git-svn but then failed and returned the error Unable to extract revision information from commit. This left all files that ...

git svn rebase resulted in byte order is not compatible error

Following is the error I am getting when I tried 'git svn rebase': Byte order is not compatible at ../../lib/Storable.pm (autosplit into ../../lib/auto/Storable/_retrieve.al) line 380, at /usr/lib/perl5/5.10/Memoize/Storable.pm line 21 The version of perl I am running is: $ perl --version This is perl, v5.10.1 (*) built for i686-cyg...

Is it possible with GIT to remove the file only from the index ?

GIT rm filename remove the file from the index as well as from your working directory. Is it possible to remove the file only from the index ? thank you, Alessandro DS ...

Per-directory permissions on git

Hello all, We are considering switching our VCS to either git or subversion. I'd prefer switching to git, but subversion has a nice feature that I don't see in git : per directory access control. We currently have project1, project2 repositories in cvs, with different permissions. We'd like to have one single repository, with two direc...

Working in sync with SVN upstream

I'm working on a project that is using code from an OpenSource project. One of the requirements is to push as much code back to upstream as possible. The remote project is using Subversion (not very well). My current setup looks like this: [Remote SVN] (git svn fetch)-> [My public Git] <-(push/pull)-> [My dev. Git] ...