Have Geek Brain

SVN Merge Question

Suppose I have two massive folders in SVN: test and prod. I am trying to use the following svn command to merge content from a test into prod:

svn merge ./prod@HEAD ./test@HEAD ./prod

However, my SVN repository is huge and the process takes a huge amount of time. Is there a way that I can make a simpler merge operator that is more CPU compatible? Possibly a merge based on the server url?

Any insight is appreciated ....

+2


a source to share


2 answers


Merging is nothing more than calculating diff and applying it on the client. Important: merge does not change the repository - it just changes the local copy. So there is no way to do this only on the server side.



+2


a source


If you intend to make the "prod" folder look the same as "test", why not just delete the "prod" folder on the server and then copy the "test" folder to where "prod" used to be? No merge required.



-4


a source






More articles:


All Articles