I'm trying to merge changes from a Trunk into a Branch. Previously when I've tried this everything has worked perfectly however in this instance the merge wizard has a cross next to "No uncommitted changes" and will not let me proceed. I've done everything I can think of to resolve this but as I have no entries in my "Pending changes" window I'm at a loss as to what could be the problem!
Any help or guidance on what to try next would be very much appreciated! I'm using Visual Studio 2012 with the latest stable 2.4 AnkhSVN release.
TL:DR - Downloaded TortoiseSVN and used it and VisualSVN server console to see exactly what was going on.
This was impossible to resolve with AnkhSVN alone. I downloaded TortoiseSVN and inspected the solution - turns out I had a tree conflict with one of my folders that had been renamed - logged into the VisualSVN Management server and deleted the "old" (original named) folder directly and pulled an update.
The next issue I discovered was the "obj" folder had somehow crept into the mix which was causing problems as visual studio loves updating files in here and so there were ALWAYS files to commit. Used TortoiseSVN to "Unversion and add to ignore list" on all the obj folders (Have about five projects in the solution that this had happened to!) and committed.
Once these steps had been taken I was able to update within Visual Studio using AnkhSVN and then use the AnkhSVN merge wizard to pull the changes from Trunk to Branch.
Related
I have a VERY large project which just went through an upgrade process. The upgrade is a process external to Visual Studio. As a result, files that are deleted by the upgrade process do not get properly detected by TFS so TFS pukes on checkin saying that it can't find the file.
The problem is that there are several hundred files that need to be excluded to resolve the issue. I could do this for days before I'm done. I'm pretty sure my boss would prefer it not take several days.
Is there a quick way to find and automate the exclusion of these files so I can just be done with it?
You have two options...
Use a Local Workspace - if you go into the settings of your Workspace you can change it from Server to Local. This will allow the changes to be detected automatically. You may need to copy everything out and then back in if you have already made the changes...
Reconcile the difference - You can use the TFS 2013 Power Tools and the "tfpt online /adds /deletes /diff /noprompt /recursive directory-name" command...How to have TFS 2010 detect changes done to files outside of Visual Studio?
This question is asking, "Am I doing something wrong," or "Is this a failure in VS2010 and TFS?"
Whenever I open Visual Studio 2010, I habitually do a "GetLatest" from TFS, and often have it overwrite my local files whether they are updated or not just to be safe. I want to make sure that any code I publish has the latest updates from other team members. Then we all check in our changes as soon as possible in order to stay in sync, as the entire team uses this practice.
What we are finding is that when NEW code is checked in (e.g. a new aspx with code-behind) doing a GetLatest will NOT grab the new files. All we get are updates to files that already exist in our local working directory. Are we doing something wrong? Is there a checkbox we need to tick somewhere to force VS 2010 to get files that are new rather than just update existing changes?
This is quite common and is the result of your local workspace getting out of sync. If it happens a lot you should delete the local TFS cache. That's in %profile%\local\Microsoft\teamfoundation*.
The best way to completely eradicate the issue is to upgrade to a newer version. This was resolved with Local Workspaces in 2012 and with Git in 2013. Its pretty strate forward to upgrade.
I am using TFS 2013 with Visual Studio online. Last day, I finished all my work and checked-in. There were some conflicts. I merged the conflicts and checked-in again. But when I open the app today, I found some methods missing. Is it possible to grab my local version just before the yesterday check-in?
This happens to me and my colleagues as well. After you merged the conflict, merged files are your latest local files. If you have decided remove your changes during merging, your changes are gone for ever.
You must pay special attention next time you merge files. This also give you another hint: Don't rely on tools. You're responsible for files you checked in.
Is there any kind of problem between Visual Studio (v2008) and Source Tree?.
I commit some changes in a branch. Change to develop branch... Then do a pull. Pull is clean but when i enter Source Tree , it updates telling me i have uncommitted changes.. that i had not before!.
Checking them, it does things from a long time ago. I cannot compile... Where does it come from??.
I also found out that when you have a conflict, it saves the ORIG file and it does not delete it. Its annoying...
I found out an answer for this mistery:
Apparently, if you have Visual Studio opened (in some cases) and you open SourceTree. If you checkout other branch or develop branch and you were in another branch, Visual Studio does not understand files changed underneath and keeps track of old ones somehow.
That's why SourceTree finds you have some changes and files that are different all the time. No matter how many times you do "stash" to those changes, they will appear all the time.
So the way to fix this is to CLOSE visual studio and saying yes to update all files that have changed. Source Tree will no longer tell you you have uncommitted changes anymore.
After installing TortoiseSVN 1.6.0, all files loaded into an AnkhSVN enabled Visual Studio 2008 project are marked as new (blue +).
I have tried re-installing AnkhSVN 2.0.6347 and checkout the repository into a new "clean" folder. However neither seem to resolve the problem.
My question is kind of two fold, is there a resolution to this issue and if there is an in-compatibility between the two products (i.e. different SVN bindings?) is there a way to tell which combination of AnkhSVN and TortoiseSVN are going to play nice with each other.
I noticed this too a couple of days ago. This happened because Tortoise converted your working copy to 1.6 version and Ankh doesn't know how to read it.
The solution is simple: I installed the latest daily build of Ankh (http://ankhsvn.open.collab.net/daily/) and now everything works like a charm.
I can verify that this works, too.
One thing that I ran into was that I uninstalled the older version before installing the new daily build version (I installed AnkhSvn-Daily-2.1.6649.29.msi), but once I installed the new version I didn't have any source code control integration whatsoever in Visual Studio 2008!
As it turned out, when you uninstall AnkhSVN your source code control provider gets set to "None", and you have to go to "Tools | Options | Source Control" and set it back to AnkhSVN.
Once you do that, you're good to go with Visual Studio integration and TortoiseSVN 1.6.
Sadly this solution does not work for anyone using VS2003 since there is no daily build (SVN 1.6) for the 1.x branch of AnkhSVN.
The AnkhSVN team has stated that they are too busy right now to update AnkhSVN 1.x (ie the VS2002/VS2003 version), so it looks like unless someone is willing to help them with it (it’s open-source), there may not be an SVN1.6 version for VS2003 for a while.