So we made a rookie mistake, One of our project team members had forgotten to commit for a couple of weeks, (some of which were vacation) but then when he did commit he did something wrong, most of the code he wrote has been overwritten with what was on the server after trying to resolve all the conflicts automatically.
So is there any way to get the code he used to have on his PC back? because a lot of work has been lost and we can't really afford to make it all again.
So just to clarify, the code which is lost is not on the server, it were his uncommitted changes on his client machine.
We are using the team foundation server and visual studio
Take a look at folder:
C:\Users\%USERNAME%\AppData\Local\Temp\TFSTemp\
In my case, searching by method name, i can recover a mistake merge =)
Nope. Code lost that never made it into source is lost. This is one of the biggest selling points of distributed version control like Git.
If your using Windows 7 or similar check for previous version of the file on his/her computer, right click the file options should be their
If you have not compiled after doing the merge, you can use DotPeek by JetBrains to decompile the assembly and get your code back
Related
I just came back from MWLUG and started to open up some Xpages DBs to work on, when all of the sudden I am getting 1000s of errors like this:
I googled the issue and I believe it has something to do with the path of the org.eclipse.pde.core.requiredPlugins.
When I opened up the packages and looked at fixing an error I got this:
The problem is that I do not know what the correct setting for this should be, or how to fix it. The apps run fine, but obviously something is wrong.
Any help would be very much appreciated.
Bryan
==================================================
I may know more about the problem. In designer when I go to File==>Application==Application Management this is what I see:
A different install has several components under it.
I updated my designer and client and admin to 9.0.1 FP4 last week. That is the last thing I remember doing before this messed up (along with installing the Debug Toolbar).
How can I fix my designer install?
Strange indeed, you should check your hard drive for bad sectors.
Looks like a broken DDE in general. The plugin XML file maybe broken so the app manager doesn't show you the plugins installed. Therefor I assume DDE starts very quickly, right? Because nothing is loaded.
I had this before and my "solution" was:
de-install DDE and Fixpacks
delete workspace folder
re-install DDE and Fixpacks
re-install plugins ad setup workig sets
This is a pity but at least you get a clean install. You don't have to delete everything (e.g. the DATA folder)
I hope this is not an incredibly stupid question.
According to what I can find online, it seems forking was added to GitLab in version 5.2. However, I can't seem to find in trace of it in the web UI. Or the help files. Or much anywhere else.
Is this perhaps a premium feature or something?
Or should it be activated/enabled somehow?
Thanks.
Also a side-note, if you haven't committed any files yet, fork option will not show to other users. you need to at least add a readme file in order fork a project.
The scenario : you have a main project at startup phase and multiple developers will be working on it. You created main project in root repo, logged out , logged with your user to for project for initial set up, fork option is not there.
Ok, I was being an idiot (sort of).
Seems if you login with a DIFFERENT user (i.e. a user who is NOT the owner of the project), the fork functionality shows up clear and plain.
Excellent then.
Props to the GitLab team - loving it!
this is EXTREMELY frustrating to anyone who just wants to pull down your code and check it out and get it to simple build successfully.
Here's the scoop.
So I open the ServiceStack.Examples-master\src\AppHarbor.sln after pulling it from github and cloning it to my local drive.
I have had nothing but trouble from the get go. I have had to fix this solution and project reference as well as assembly references.
there's nothing more irritating to a developer no matter if it's an internal solution or set of .NET projects or external, that bomb during initial build. This stuff should be building period.
Also when I can't even download an examples solution and get it to build it makes people wonder how well this open source API really is, can I truly even rely on it? This reflects on you Service Stack.
here's is what I did, nothing out of the norm here:
1) Cloned ServiceStack.Examples to my local c:\www\Sandbox folder where I keep stuff I'm playing around with
2) Just looking at the folder structure from the start, it makes no sense in terms of being discoverable and more importantly organized. For example why is there yet another ServiceStack.Examples inside src and then outside of that a ton of other example folders of other example apps in the root of \src also??? So you have stuff in src\ and in src\ServiceStack.Examples, this is hell confusing and disorganized.
ServiceStack.Examples\src\ServiceStack.Examples
3) Opened C:\www\Sandbox\ServiceStack.Examples\src\AppHarbor.sln
4) Tried to build all, and the first major problem is the MovieRest project doesn't load. I get an error while opening the .sln that it failed to load it:
ok fine, this is still ridiculous, nobody who downloads a solution should need to worry about fixin this but of course I did, so I readded it because in actuality this .csproj was moved into the src\ServiceStack.MovieRest\Web\ folder and looks to me like nobody even reopened the solution to fix it??
5) So then I go to try and build the solution again, notice all the missing binary references in MovieRest. So ultimately I figured ok, looks like pretty much every other project is getting their references from their associated packages folder however for some Reason MovieRest and the Nortwind projects don't have anything in their packages folder. so I end up manuall opening up the MovieRest VS 2012 solution and building it, and I guess Nuget must run or something during that build? Because now walla, I see the missing assemblies pop into ServiceStack.Examples\src\ServiceStack.MovieRest\packages finally.
6) Ok, so I rebuild again, and now it's complaining about missing sqllite assemblies and also a sqllite3.exe. So now I have to hunt around again to find them for the x84 and x64 and copy those missing assmblies back into ServiceStack.Examples\src\ServiceStack.MovieRest\Web\sqlite and I also noticed that MoviewRest project was referencing sqllite3.dll in the root of the project which was also missing...this is such a mess.
7) I notice that the Northwind project doesn't build either
I don't know what is going on here, I mean is the build really that messed up? Has to be.
Who is gonna fix this on the ServiceStack end? how the heck do I get this to finally build and how has this not been reported?
UPDATED 9/23
Here are the errors I get after pulling down the "fixed" solution. I did a Shift + Ctrl + B on it (Build All). Let me know if I am just missing something here but it's not building yet at least on my side:
UPDATE 10/1
Ok again lets talk about this.
I pulled this zip down: https://github.com/ServiceStack/ServiceStack/archive/v3-snapshot.zip from this page: https://github.com/ServiceStack/ServiceStack/releases
Opened the solution src\ServiceStack.sln (VS 2012 version)
First I get this SQL Express Error after opening it for the first time:
Now I try to build all on the solution and I get this build error:
So tell me what I could possibly doing wrong? This is a "Release" right? It should build right? It's not rocket science so how can people say this is a "dev consumer" issue? All I want is a stable release build. Simple.
I've just upgraded ServiceStack.Examples to VS 2013/IIS Express and updated it to the latest version of ServiceStack v3.9.63 that was just deployed. It should all build now, also some examples requires redis to be running on localhost.
I'm finding the BB/Eclipse environment incredibly unstable and wanted to know if I'm doing something fundamentally wrong here?
I build my project and it produces about 40 or so COD files... usually. Sometimes if I clean and run some COD files are missing and it fails to run (or worse it runs the old version somehow). I kid you not, I'm spending about an hour each time I want to run/test my setup which is an order of magnitude slower than the other platforms I work with. It eventually works by hitting the clean/debug/clean/debug/etc... and doing nothing else except these clean/debug/repeat steps.
If I make incremental changes to my src it's fairly reliable at picking them up but when I add a new resource via windows explorer and say 'refresh' on that directory in eclipse it's when all the problems start.
Any pointers from experienced Eclipse/BB users would be much appreciated (especially how to narrow down why sometimes it works and sometimes it doesn't).
Thanks,
Stuart
I believe I've narrowed down the issues. Firstly I use DropBox on the src but this has the inadvertent feature of backing up build files and can't find a way of disabling this.
If the files are locked by Dropbox it unsurprisingly fails, the catch is it doesn't say 'couldn't write to file as it's locked' or anything helpful like that... just fails. Obviously when I go to inspect it Dropbox has done it's stuff so the perfect crime!
My learnings:
disable Dropbox on COD producing builds.
When changing SDK version I found I have to
change the SDK via the build config settings,
clean,
exit eclipse,
delete the build directory with windows explorer,
Restart eclipse and hit refresh/clean.
That seems to build fairly reliably now. Without restarting Eclipse I get all sorts of wierd errors of files going to wrong locations and dirty data being picked up. The main one is any //#ifdef's are not picked up by the preprocessor correctly so get 1001 errors.
I'm working on a website with some other people. Usually when we want to modify something, we do the change on our machine and just upload the new version with ftp, hope it'll works (or that nobody will notice it doesn't the time we correct it) and that's it.
It's already not the best way to work alone but even less to work collaboratively so I'm asking advices.
I think that a solution like svn/git/mercurial could help me. I found bitbucket which allows free private repository with mercurial. But still after, how can I upload the changes I did to the ftp and make sure the version I've on my computer is the same than the one on the server.
We are all doing it during our free time (not paid) and some people comes and leave every year so I'm looking for something free, easy to use (explain to everyone why we should use a DVCS is already hard) and which doesn't rely on a specific person.
The server we are using to host the website is a cheap one and doesn't allow the use of ssh, svn,...
Thank you
Version control will not help with the issue you are describing - namely, uploading untested changes to a production site.
What you (and your team) need, is better quality control procedures - you need a test website and a tester (QA) person. The process would be:
Make a change
Update the test website
Have the update and the whole website signed off by QA
Update the production/live site
What you will gain by using version control (CVS, SVN, Git or anything else) is recoverability - you will be able to go back to a version before any breaking change. It will still not solve the issue of "the new code broke the site".
You want scheduled releases.
Commit and update code regularly
Code freeze or develop in a branch and merge to the trunk
test on a staging environment
Find a bug goto step 1
Release
You need to understand that what represents your latest correct working build is not what's on the server but in your source repository whether that be SVN or just the file system. Anything as long as it isn't the live server! Make sure everything works locally as expected then unless the site is huge (I guess not given your situation) deploy it in its entirety as a single version.