CODEWITHSUNDEEP
linuxsvn
ragingcorgi
ragingcorgi

Reputation: 3468

svn-update version mismatch with commit version

I'm having this issue updating my code with my partner's code. My partner's last submission was on revision 36, but when I updated my working directory svn said the version jumped to 38. I don't know why it did this. When I was updating I made one of the conflicting files accept my version. Also my partner copied something into her own svn before I updated mine. Which part of these caused the mismatch in the version number? Thanks

Upvotes: 0

Views: 485

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97280

Revison in Subversion is global attribute of repository, each subtree can and may own revision less than HEAD-revision of repo

Check with svn info state of your working copy. As example for trunk of one of my repo

...
Revision: 37
...
Last Changed Rev: 36

i.e - latest revision in repo is 37, but in trunk subtree - only 36

Upvotes: 1

Related Questions