I am currently working on a project using svn (server is version 1.4 which means no modern merge tools available). I want to merge a branch with quite a few weeks of work in it. The problem is that back when the branch was created, it was made as a copy only of a subfolder. Svn structure of project: /trunk/folder1 /file...
I am using git-svn for our svn repository. However, the repo is huge, so I first checked out the project like so: git svn clone svn://svn.server.com/project -s -r 12000:HEAD So, now I have only revisions 12000 to the current revision. I would like to checkout some more revisions, but the following does nothing: git svn fetch -r 11000...
Is there a way to redo a git-svn rebase. or reset any effects by it. In my +8000 commit git-svn repository, something went wrong after merging a branch. My local "master" does not reflect anything near a complete log of trunk. And running git svn rebase correctly fetches new revisions but then tries to apply what looks like all 8000+ c...
Somebody is planning to move the subversion repository I work on (8000+ commits). Is there a way to use git-svn to replay the last, say, 20 commits from the old location once the migration is finished? (not only my own commits, but also other team members) Bonus question: How do I add multiple svn repositories to my git local copy? ...
When using svn, I update a repository with the following command. TortoiseProc.exe /command:update /path:"c:\FoldToSVNRepository" TortoiseProc.exe /command:update /path:"c:\FoldToSVNRepositoryTwo" TortoiseProc.exe /command:update /path:"c:\FoldToSVNRepositoryThree" How would you do the equivilant with the command git svn ? I've had a ...
I'am using git as scm of choice but have to use a svn-repo. I can create a svn-remote-branch like this: git svn branch the_branch But how can i delete the remote branch? ...
I have checkout'ed svn repo through git, but not from the first svn commit. Now I would like to extend the history a little back into past. Is it possible? ...
The book 'Git Internal' mentions about using git as peer to peer content distribution network at p50, but doesn't have much detail. Especially how to have several branches which has tracking different files. Example: (working dir) a00.exe a01.exe b00.exe c00.exe c01.exe c02.exe Master branch tracks all files, while branch A only tracks...
I'm using git-svn to work with an svn repository. I have my git master branch tracking svn, and several local git branches. Is there any way to set up things so that if I run git svn rebase or git svn dcommit on a git branch other than master it will simply do nothing? ...
Hi, I'm looking for a way to list all updated files in the remote master branch, similar to svn log. Is that possible in Git? Thanks, Christoffer EDIT (Solution): git fetch git diff --name-status origin/master ...
Hi, I've read a great deal of "go from svn to git" and other "git-svn workflow" articles on the web, and still I think they often deal with overly simple situations. They are often targeted at guys who just want to use git and hack locally, without using the full power of git, like pull, fetch, merge and the like between multiple develo...
Is there a way to tell git to ignore a file that's stored in its origin? Since the files in question are in the upstream repository, just adding them to .gitignore or .git/info/exclude don't work. Background: My upstream repository has some generated files in it. Every time I do a local rebuild, these generated files are changed and ...
The SVN repository that I am working with has a rather large number of branches. I am only interested in working with three of them and maybe another new SVN branch that will be created in the future. What I have figured out so far is that the command git svn clone URL -T trunk -b branches -t tags will clone all SVN branches and subseq...
I have a workflow(on svn) which I am trying to replicate with git, but am unable to. I have a large number of Django apps (which are plugged together to form a form a full project) Some of these are in one large repo and others are in smaller repos. My layout looks something like, app1 -> repo1/app1 app2 -> repo2/app2 app3 -> repo1/ap...
Odd situation is happening when I try to clone a remote svn repository. When I type: git svn fetch Git will fetch the first 20 revision of the remote repository then at some point after 20 revisions it fails and just prompts the following error message. fatal: write error: Invalid argument Then just sits there doing nothing else. Rep...
Looking for a command like 'ls -R' or 'dir/s' can list all files in a commit/branch. Is there any command can compare two files from different branch? Thanks! a lot! ...
Git clone will behave copying remote current working branch into local. Is there any way to clone a specific branch by myself without switching branches on remote repo? Thanks ...
i'm inheriting a codebase that has a lot of directories in trunk that really should live in separate repos. all of my development happens in one specific directory, what should be the only thing in trunk. e.g: /path/to/repo/trunk/true_trunk all the tags and branches in the repo refer exclusively to this 'true_trunk' directory. proble...
Hi, I'm getting this error while doing a git svn rebase in cygwin Out of memory during "large" request for 268439552 bytes, total sbrk() is 140652544 bytes at /usr/lib/perl5/site_perl/Git.pm line 898, <GEN1> line 3. 268439552 is 256MB. Cygwin's maxium memory size is set to 1024MB so I'm guessing that it has a different maximum memor...
I use git-svn to interact with an existing SVN repository that contains some C++ projects. subwcrev.exe is used as a pre-build event to update some strings in a C++ header (svnversion.h). These strings get hardcompiled to form some version information for the resulting binary. Since subwcrev requires .svn metadata to work, the pre-build...