Take the 2-minute tour ×
Server Fault is a question and answer site for system and network administrators. It's 100% free, no registration required.

A few years ago, TortoiseSVN 1.4.3 was deployed to our software development team and we are now looking at upgrading the client to the latest 1.6.x version. I had hoped this upgrade would be transparent with the additional features and modifications being client-side. For the most part, this was true except for a very important feature -- merging. When I try to merge a feature branch back into truck I get a show-stopping "Merge tracking not supported error."

Here are some facts worth noting:

  1. When the repo was first created (before I was on board), it was created via the TortoiseSVN client itself. We do not have a 'svn server daemon' per se, rather the repository folders/database resides on a share folder that is accessible from our workstation machines via file:///. This was actually an eye opener for me, I had always thought there was some SVN server daemon we were talking to.

  2. We do not have any access to the underlying machine hosting the SVN share other than the ability to read/write to the share itself. I don't even know what OS the machine is running on. This share server was chosen because its drives are backed up nightly by our IT group.

  3. In all honesty, we really don't need the merge tracking feature although it would be nice to have. For the time being it would be sufficient to be able to use a 1.6.x TortoiseSVN client on the 1.4.3 repository and have it merge (sans tracking) without error.

So now the question becomes, how does one upgrade a client-created 1.4.3 repo to a 1.6.x compatible version without access to the underlying machine the repo resides on? I was hoping the TortoiseSVN client itself had the ability to do this but that does not appear to be the case.

Will I be forced to copy the entire repo over to my local drive, run some svn commands to upgrade the repo locally then copy the repo back to the share point? If so, will doing this break any compatibility with the the 1.4.3 clients in case we cant upgrade them all at the same time?

Thanks for the help.

share|improve this question
    
You should discuss this with your system administrator. –  John Gardeniers Apr 30 '10 at 3:47

1 Answer 1

up vote 1 down vote accepted

In order to get merge tracking you need to run svnadmin upgrade on the repo. I don't think you can do this remotely so you'll need to either copy the repo and upgrade it or get whoever owns the server to upgrade it. To be perfectly honest, you should get the server upgraded too so you're running 1.6 client against a 1.6 server with a 1.6 repository.

1.7 is coming soon and that has a lot of new features you'll probably want, so doing this properly and getting a procedure in place to do it again is worthwhile.

share|improve this answer
    
You should also do a dump and restore to get the file system benefits that 1.6 provides. –  Nils-Anders Nøttseter Sep 15 '10 at 11:52
    
not so: "svnadmin upgrade" is all you need to do. Ok, you won't get sharding by default as your repo will stil be in a single directory, but other than that, you'll be running with the 1.6 format. –  gbjbaanb Sep 16 '10 at 22:20

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.