Improve company productivity with a Business Account.Sign Up

x
?
Solved

Getting the latest code from svn

Posted on 2014-01-06
2
Medium Priority
?
435 Views
Last Modified: 2014-02-16
I am trying to get the latest code from svn. When I do so, for one file, it shows a conflict.

I haven't changed this file, so I don't know why it show a conflict. Is there any other reason for conflict as well.

Secondly, how do I force it to update this file from svn. I know that the other developer has made some changes, so I need it in my codebase.
Perforce has a 'Force update' option, but couldn't find it in svn.
0
Comment
Question by:ank5
2 Comments
 
LVL 28

Expert Comment

by:Ryan McCauley
ID: 39773634
SVN also has a --force option to overwrite the local file if it perceives there to be a conflict - you can get details with:

svn help checkout

Open in new window

0
 
LVL 8

Accepted Solution

by:
Surrano earned 2000 total points
ID: 39832213
I recommend moving that file out of place (either renaming it in the same dir or moving it to a completely different location. Then repeat the update on that dir (or one of its parents) to see if it helps.

If it helps, you can compare the changes; merge whatever's needed and commit as a merged revision.

If it doesn't help then you probably have a damaged temp file in the checkout; in tortoisesvn it's .svn/pristine/... and honestly I don't exactly know how to find the proper temp file since it uses obfuscated (but unique) names.
0

Featured Post

Keep up with what's happening at Experts Exchange!

Sign up to receive Decoded, a new monthly digest with product updates, feature release info, continuing education opportunities, and more.

Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

Join & Write a Comment

INTRODUCTION Subversion is a fantastic version management and software configuration management tool for teams and individuals to manage software applications. It offers many advantages over it's CVS ancestor such as it's built-in compatibility w…
When working in a large software development team, whether you have many developers working on the same projects, or your project is linked to other projects; it is very important that developers regularly perform "get latest" to ensure that the cha…
When you have multiple client accounts to manage, it often feels like there aren’t enough hours in the day. With too many applications to juggle, you can’t focus on your clients, much less your growing to-do list. But that doesn’t have to be the cas…
Watch the working video to know how to import Outlook PST/OST files to Amazon WorkMail. Kernel released this tool which is very easy to use and migrate single or multiple PST and OST files to Amazon WorkMail. To know more about Kernel Import PST to …

584 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question