 |
|
|
|
|
|
||
|
|
||
|
|
||
|
|
|
|
|
|
||
|
|
||
|
|
||
|
|
|
|
|
|||||||||||||||||
Add Forum to Favorites | Send Topic To a Friend | View Forum FAQ | Track this topic |
Last Thread Next Thread |
| Subversion question |
|
 |
DaWanderer Member since: 5/11/2000 From: USA |
|||
 Posted - 8/24/2005 11:48:58 AM |
||||
| I started using Subversion recently as my source code control system and I've enjoyed it so far. I'm using the Tortoise SVN shell integration tool for Windows too. I'm curious about one thing, though. When I execute an "svn update" or choose Update in the tool on one of my working copies, I get an error that a non-versioned file already exists. I understand that SVN isn't going to unnecessarily overwrite a file of mine, but it's really irritating to have to delete the whole directory and re-check it out just to get the latest working copy (that or update each individual file by hand). I've searched around on Google and haven't found a solution for this. Is there a command line switch that I'm just not seeing to avoid trying to update non-versioned files or is this something I have to live with? |
||||
|
||||
|
Randy187 Member since: 3/30/2003 From: Zeist, Netherlands |
|||
|
Posted - 8/24/2005 11:59:17 AM |
||||
| Is that non versioned file already in your repository? |
||||
|
||||
|
polly Member since: 10/17/2001 From: London, United Kingdom |
|||
 Posted - 8/24/2005 1:04:09 PM |
||||
| I'm not too sure what you mean. Do you mean that in your dev home you have a file that is of the same name and path as a file that you want to keep separate from the repository? And then whenever you try and do an update you have to stop this file being overwritten? If so, then why is that file the same name and location as the one in the repository and why do you want to keep it outside version control? A better idea of the directory structure and the commands you are using would help us help you with the problem. Jon EDIT: 99% of the time when Subversion complains to me it means I've done something silly. |
||||
|
||||
|
paulecoyote Member since: 7/14/2003 From: Alton, United Kingdom |
|||
|
Posted - 8/24/2005 5:06:18 PM |
||||
| when u delete a file it is best to do it via right click and via tortiose. Anyway if you use the repo browser you should be able to delete stuff. If you have everything checked in try forcing a revert to the current version rather then an update, that might do it. Make sure it is reverting to the current version though! |
||||
|
||||
|
DaWanderer Member since: 5/11/2000 From: USA |
|||
|
Posted - 8/24/2005 9:14:48 PM |
||||
| I guess I didn't explain the situation very well. Here are the steps I took: 1. Import my project folder to the repository 2. Go to another machine and check out the project 3. Modify the project 4. Commit all changes 5. Return to my original machine and choose Update to obtain the latest changes I'm simulating multiple users here working on the same codebase on different machines. The users do not edit the same files, so no conflict occurs. What I want is to be able to pull in the latest changes for the codebase (say, every morning). Am I thinking about this incorrectly? When I choose "Update", I would imagine that Subversion would go out and get all the files in the repository that have changed and update my working copy. I get an error message about a non-versioned copy of a file already existing on my system. Well, I didn't choose to have that file non-versioned and of course it's there: it's my copy as of the previous day! Any ideas? |
||||
|
||||
|
Arild Fines Member since: 8/20/2001 From: Oslo, Norway |
|||
|
Posted - 8/24/2005 9:49:25 PM |
||||
| You're doing something wrong. |
||||
|
||||
|
DaWanderer Member since: 5/11/2000 From: USA |
|||
|
Posted - 8/25/2005 12:58:58 AM |
||||
| What are the steps you would take to add a project to the repository and then update your working copy later on? |
||||
|
||||
|
Julien Koenen Member since: 7/29/2003 From: Germany |
|||
|
Posted - 8/25/2005 3:20:32 AM |
||||
| Just a wild guess: Do you have any temporary/generated file in your repository (famous examples are the .suo/.opt Files from Visual Studio) Greets Julien |
||||
|
||||
|
etothex Member since: 5/2/2004 From: Los Angeles, CA, United States |
|||
|
Posted - 8/25/2005 3:51:28 AM |
||||
Quote: This happens all the time in projects with more than a few people, when people checkout a repository and then accidentally commit the binaries. Probably on machine 2 you added the .obj files, (or .o on *nix) and since they already existed on machine 1 subversion starts whining. |
||||
|
||||
|
samv Member since: 5/1/2005 From: Zurich, Switzerland |
|||
|
Posted - 8/25/2005 4:12:14 AM |
||||
Quote: That's not how it's done (even though it feels more natural to many people). Instead, do this once: 0.a) Import my project folder to the repository 0.b) Delete original folder (or rename and delete later or whatever) then, do the following as often as you like: 2. Go to _any_ machine(possibly the one you used to import the original files!) and check out the project (or update, if you already checked out earlier) 3. Modify the project 4. Commit all changes The important thing to note is: The initial copy you used to import is not a checked out copy. It cannot be used to work with subversion. You need to check out your own copy. (Even though you already have all the files) |
||||
|
||||
|
meh Member since: 7/30/2001 From: Dundee, United Kingdom |
|||
|
Posted - 8/25/2005 5:48:12 AM |
||||
On the temporary files thing you can tell SVN to ignore directories and files. In this working copy dir you can see the folder bin and file MANIFEST.MF, these are both generated at compile and aren't something you really want to store in the repository so right click and choose Add to ignore... in TortoiseSVN. |
||||
|
||||
|
DaWanderer Member since: 5/11/2000 From: USA |
|||
|
Posted - 8/25/2005 10:06:57 AM |
||||
| Thanks a lot for the responses, everyone. I was checking in everything, including the suo file from VS.NET. I wasn't aware of the ignore feature, so I'll just do that with all the temporary files. |
||||
|
||||
| All times are ET (US) |
Last Thread Next Thread |
|
