Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Subversion issue with working copy at a single revision

I'm using subclipse to merge changes from the trunk into a branch and during the "best practices" step, there's a notification that the working copy is not at a single revision. None of the files or folders in the package explorer have the dirty indicator and (having been through this before) even after doing an update, none of the version numbers appear to have changed. What specifically is subclipse looking at to generate this notification? Is there something I can also run from the command line to corroborate this?

like image 927
opike Avatar asked Jan 14 '23 21:01

opike


1 Answers

It basically means you have a "Mixed Revision Working Copy" which is very normal and common. If you Google it you will find a lot of explanations. A blog post I wrote many years ago is the top hit:

http://markphip.blogspot.com/2006/12/mixed-revision-working-copies.html

Subversion merge works a lot better if you have your working copy at a single uniform revision. So just run update. The merge wizard will do this for you if you let it.

like image 94
Mark Phippard Avatar answered Jan 17 '23 11:01

Mark Phippard