Compilation Error (.svn/entries)

Bug #370724 reported by Stefan Kriwanek (Divan)
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Return To The Roots
Status tracked in S25client
S25client
Fix Released
Medium
FloSoft

Bug Description

The version/src/main.cpp fetches the revision number from .svn/entries.
Though, people like me who want to compile from your source have to use bazaar and don't have got this file in the source tree.

If anyone used bazaar, the fix would be to simply extract the number from the corresponding bazaar file (.bzr/branch/last-revision). But Demophobie told me that at least he does not.

A Workaround is to create the file .svn/entries and type the following into it (of course you may change the revision number to anything you like ;) ):
9

dir
4761

Revision history for this message
FloSoft (flosoft) wrote :

okay,

i have to look at the format of ".bzr/branch/last-revision" and then change the version-tool to check if theres a .svn or a .bzr directory.

I'll do that next week as soon as I am back home.
But perhaps someones faster than me and creates a patch ;-)

Revision history for this message
Stefan Kriwanek (Divan) (dev-stefankriwanek) wrote :

I've added a fix that does what I described in the first post.
Problem: .bzr/branch/last-revision contains the last _local_ revision. That will probably differ from the official one.
Using 'bzr pull --overwrite' you may get the main branch with bazaar, by loosing all local changes.
So this is merely a workaround to prevent compilation error and will result in not being able to play network games because of differing revision number for anyone wanting to hold a differing branch.

Revision history for this message
FloSoft (flosoft) wrote :

the patch was committed to bazaar/svn

I think I'll do a complete rewrite of the "version"-tool soon and make it more flexible.
I think I can also remove the obsolete xml-style-subversion code, because we're running subversion > 1.5 anyway

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.