Solved

Getting the latest code from svn

Posted on 2014-01-06
2
356 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 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

Free Tool: SSL Checker

Scans your site and returns information about your SSL implementation and certificate. Helpful for debugging and validating your SSL configuration.

One of a set of tools we are providing to everyone as a way of saying thank you for being a part of the community.

Question has a verified solution.

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

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…
Article by: gr8gonzo
Git can be a complicated version control system for beginners, but it definitely is one of the best ones out there. Since this article assumes that you're starting at square one, it will skip over things that Git -can- do and will focus on the typic…
Two types of users will appreciate AOMEI Backupper Pro: 1 - Those with PCIe drives (and haven't found cloning software that works on them). 2 - Those who want a fast clone of their boot drive (no re-boots needed) and it can clone your drive wh…
Nobody understands Phishing better than an anti-spam company. That’s why we are providing Phishing Awareness Training to our customers. According to a report by Verizon, only 3% of targeted users report malicious emails to management. With compan…

820 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