git-svn merge 2 svn branches

Posted by idimba on Stack Overflow See other posts from Stack Overflow or by idimba
Published on 2010-04-22T19:20:44Z Indexed on 2010/04/22 19:23 UTC
Read the original article Hit count: 386

Filed under:

newbie

|

svn

|

git

|

merge

I using svn. I have two branches and on both of them were performed a lot of changes. In addition of one of the branches a lot of files were renamed, so now svn can not help me merge changes in those files (well know svn limitation).

Is it possible using git-svn to perform the merge of the branches? Will git-svn hanndle renamed files too?

Thanks

© Stack Overflow or respective owner

Related posts about newbie

The newbie's guide to hacking the Linux kernel

as seen on Internet.com - Search for 'Internet.com'
<b>TuxRadar: </b>"We asked prolific kernel hacker (and Linux Format reader!) Greg Kroah-Hartman to tell us what it takes for newbies to patch the Linux kernel - here's what he had to say." >>> More
Static IP on FEDORA12 from Virtualbox

as seen on Server Fault - Search for 'Server Fault'
I'm trying to get my FEDORA12 to have an STATIC IP - inside virtualbox - inside Ubuntu Let me rephrase that. I have an Ubuntu 9.04 system with vitualbox and a FEDORA12 vm there and I would like to put the fedora with an STATIC IP (amahi needs it), but I'm getting stuck... I'm using NAT (if that's… >>> More
Static IP on FEDORA12 from Virtualbox

as seen on Super User - Search for 'Super User'
I'm trying to get my FEDORA12 to have an STATIC IP - inside virtualbox - inside Ubuntu Let me rephrase that. I have an Ubuntu 9.04 system with vitualbox and a FEDORA12 vm there and I would like to put the fedora with an STATIC IP (amahi needs it), but I'm getting stuck... I'm using NAT (if that's… >>> More
Static IP on FEDORA12

as seen on Server Fault - Search for 'Server Fault'
I'm trying to get my FEDORA12 to have an STATIC IP - inside virtualbox - inside Ubuntu Let me rephrase that. I have an Ubuntu 9.04 system with vitualbox and a FEDORA12 vm there and I would like to put the fedora with an STATIC IP (amahi needs it), but I'm getting stuck... I'm using NAT (if that's… >>> More
Lotus Domino Administrator client missing

as seen on Server Fault - Search for 'Server Fault'
Hi, I have just installed the trial version of Lotus Domino and now I'm pulling my hair out as for some stupid reason I can't find the Domino Administrator client. I have found multiple suggestions on various websites where to download it from, but all of them lead to the same section of the IBM website… >>> More

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> More