Solved

Getting the latest code from svn

Posted on 2014-01-06
2
372 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
[X]
Welcome to Experts Exchange

Add your voice to the tech community where 5M+ people just like you are talking about what matters.

  • Help others & share knowledge
  • Earn cash & points
  • Learn & ask questions
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 500 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

[Webinar] How Hackers Steal Your Credentials

Do You Know How Hackers Steal Your Credentials? Join us and Skyport Systems to learn how hackers steal your credentials and why Active Directory must be secure to stop them. Thursday, July 13, 2017 10:00 A.M. PDT

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

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…
This video Micro Tutorial shows how to password-protect PDF files with free software. Many software products can do this, such as Adobe Acrobat (but not Adobe Reader), Nuance PaperPort, and Nuance Power PDF, but they are not free products. This vide…
Monitoring a network: why having a policy is the best policy? Michael Kulchisky, MCSE, MCSA, MCP, VTSP, VSP, CCSP outlines the enormous benefits of having a policy-based approach when monitoring medium and large networks. Software utilized in this v…

705 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