[Fixed] svn checkout files don't match commit?

[Ken g6]

Can somebody please help explain Subversion to me?

I committed a revision (r801) on a Dev server. I want to check out that revision on a QA server so it can be tested. I'm trying not to tag it until it is tested. I checked out the code on the QA server. It claims to be r801, but the files don't match.

The only difference I can see between the two svn configurations is when I run "svnversion". Dev says "775:801", while QA says just "801". What's going on?

I wish I could just use Git instead.

 

[nakedfrog]

I've mostly used SVN with TortoiseSVN or AnkhSVN, in this situation I'd probably look at the commit logs and see what's going on.

 

[Ken g6]

True, that is another difference. The commit log on QA doesn't list commit 801, just 800.

 

[Elixer]

The only difference I can see between the two svn configurations is when I run "svnversion". Dev says "775:801", while QA says just "801". What's going on?

775:801 is a mixed revision working copy.

That could happen because of externals, or on the Dev machine, changes were made.
Usually, you can do a svn update, (or was it svn merge) and IIRC, it should ask what to do, but, you can always force the update if you want to match the QA repo, but I would check with svn diff to see what is different exactly. Been too long since I used svn, every place I know switch to git or hg.

 

[Ken g6]

svn diff returns nothing. What's that mean?

Do you think doing another commit would fix the problem?

 

[Elixer]

What does svn status --show-updates show?

*edit, come to think of it, you should be able to do svn diff -r 775:801 --summarize as well

 

[Ken g6]

What does svn status --show-updates show?

Nothing more than svn status. A few files that aren't in the repository and shouldn't be.

*edit, come to think of it, you should be able to do svn diff -r 775:801 --summarize as well

That shows a bunch of stuff. Why can't I upgrade or switch to that revision? It says "svn: Revision range is not allowed".

 

[Ken g6]

Well, I'm not sure how, but switching from the tagged branch to "trunk" fixed it.

 

[Elixer]

That shows a bunch of stuff. Why can't I upgrade or switch to that revision? It says "svn: Revision range is not allowed".

Hmm, sorry, been way too long, and I am out of svn practice.