|
SageTV Studio Discussion related to the SageTV Studio application produced by SageTV. Questions, issues, problems, suggestions, etc. relating to the Studio software application should be posted here. |
|
Thread Tools | Search this Thread | Display Modes |
#1
|
||||
|
||||
Subversion Question
Warning, I know little to nothing about subversion.
I'm using NetBeans as my Java IDE and I've recently starting getting this error when I try to commit my changes to a repository that I have setup on google code: Code:
org.tigris.subversion.javahl.ClientException: Merge conflict during commit svn: Commit failed (details follow): svn: File or directory 'src\tmiranda\podcastrecorder\API.java' is out of date; try updating svn: resource out of date; try updating The SVN command returned with an error which indicates that some files in your working copy are out of date. Run update and attempt your command again. The version on my development machine is the most recent version.
__________________
Sage Server: 8th gen Intel based system w/32GB RAM running Ubuntu Linux, HDHomeRun Prime with cable card for recording. Runs headless. Accessed via RD when necessary. Four HD-300 Extenders. |
#2
|
||||
|
||||
I found the answer to my question. I had to rename the .mine files to .java, tell subversion that I had resolved the issues, and then commit the changes. Hopefully I didn't botch anything!
__________________
Sage Server: 8th gen Intel based system w/32GB RAM running Ubuntu Linux, HDHomeRun Prime with cable card for recording. Runs headless. Accessed via RD when necessary. Four HD-300 Extenders. |
Currently Active Users Viewing This Thread: 1 (0 members and 1 guests) | |
|
|
Similar Threads | ||||
Thread | Thread Starter | Forum | Replies | Last Post |
Picture quality question, also question on delays | andrew1810 | SageTV Software | 5 | 03-08-2006 04:51 PM |