|
Just checked in some critical changes to two files. TFS happily took the changes in one and discarded the changes in codebehind. No merge warnings. The local changes are not available too.
If this is going to be the quality of Microsoft software?
Vasudevan Deepak Kumar
Personal Homepage Tech Gossips
The woods are lovely, dark and deep,
But I have promises to keep,
And miles to go before I sleep,
And miles to go before I sleep!
|
|
|
|
|
Subversion did that to me the other day. It was rather disconcerting.
|
|
|
|
|
And Git did that to KDE's 1500 repositories the other day too.
There must be something in the air...
If your actions inspire others to dream more, learn more, do more and become more, you are a leader.-John Q. Adams You must accept one of two basic premises: Either we are alone in the universe, or we are not alone in the universe. And either way, the implications are staggering.-Wernher von Braun Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.-Albert Einstein
|
|
|
|
|
When it comes to source code fumbling, VSS is the industry leader.
|
|
|
|
|
so true......
If your actions inspire others to dream more, learn more, do more and become more, you are a leader.-John Q. Adams You must accept one of two basic premises: Either we are alone in the universe, or we are not alone in the universe. And either way, the implications are staggering.-Wernher von Braun Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.-Albert Einstein
|
|
|
|
|
Hmm. Our group has been using Visual SourceSafe for 13 years. We now have six data bases, four major products with 2-3 branches each, a number of minor products, and a pile of departmental tools.
We have never had a data loss attributable to a SourceSafe bug. Not one f***ing time.
Software Zen: delete this;
|
|
|
|
|
Then you've been very uniquely lucky. We've lost source code many times. And the merging is part of the issue.
If your actions inspire others to dream more, learn more, do more and become more, you are a leader.-John Q. Adams You must accept one of two basic premises: Either we are alone in the universe, or we are not alone in the universe. And either way, the implications are staggering.-Wernher von Braun Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.-Albert Einstein
|
|
|
|
|
Seeing as you linked from my post below.
I visited Microsoft before TFS was available, we were still on VSS. I asked them if they used VSS, they didn't. I asked them when they last used it, none of them had used it in their time at Microsoft. It was instructive that the final version was left so long without an upgrade, or even an MS alternative in the pipeline, they'd obviously given up on it.
It's been so long since I dropped it I can't remember the specifics, I do remember several occasions where I had to spend hours (one time days) cleaning up the mess due to the poor way VSS handled how it the integrity of the code after check-ins. Not bugs as such, just a crappy way of working. I also remember the sense of relief when we deprecated the system and moved to something a bit more reliable as actual source control software.
I'd be interested to know if anyone here has had your experiences with it, your the first person I remember ever supporting it.
|
|
|
|
|
I'll grant that my experience is exceptional.
A lot of our success with SourceSafe is probably due to the options we chose when we started with it. We deliberately chose to disallow multiple checkouts, which means we don't have merge issues, since we don't do merge operations. We also chose to only allow checking out the latest version of a file. Both of these choices were made with our local engineering processes in mind. They are actually less restrictive than you might think. I only have to ask someone to check a file in so I can make changes once a month or less.
We created our own branch application, given the limitations of SourceSafe's builtin operation. Again, this was based on local practice.
We follow a number of best practices for SourceSafe, some from Microsoft, some learned on our own. Our data bases are <5GB of data. Our group is only a dozen engineers, so we don't have issues with lots of users. Our SourceSafe data bases are backed up and consistency-checked nightly.
SourceSafe has limitations compared to modern source control systems. If you can live with those limitations, there's no reason you can't use it successfully.
My response to the original post was based on the fact that I'm tired of hanging my head in shame just because we use SourceSafe in my shop.
Software Zen: delete this;
|
|
|
|
|
I know the Windows team uses an internally built tool that's built around their hierarchical merging process; I wonder what the other teams used.
Did you ever see history portrayed as an old man with a wise brow and pulseless heart, waging all things in the balance of reason?
Is not rather the genius of history like an eternal, imploring maiden, full of fire, with a burning heart and flaming soul, humanly warm and humanly beautiful?
--Zachris Topelius
Training a telescope on one’s own belly button will only reveal lint. You like that? You go right on staring at it. I prefer looking at galaxies.
-- Sarah Hoyt
|
|
|
|
|
Gary Wheeler wrote: Our group has been using Visual SourceSafe for 13 years...We have never had a data loss attributable to a SourceSafe bug. Same here, only one year less.
"One man's wage rise is another man's price increase." - Harold Wilson
"Fireproof doesn't mean the fire will never come. It means when the fire comes that you will be able to withstand it." - Michael Simmons
"Show me a community that obeys the Ten Commandments and I'll show you a less crowded prison system." - Anonymous
|
|
|
|
|
I remember last time I was on a project using it had to clean it up often. Besides that worked well.
|
|
|
|
|
Same with us as well after 12 years and 3 years at my previous company. I do recall once we were doing a huge merge and had to spend a lot of time manually fiddling around to get it right, but we never lost data.
We have been preparing to leave VSS behind and move on to TFS or something similar.
Soren Madsen
"When you don't know what you're doing it's best to do it quickly" - Jase #DuckDynasty
|
|
|
|
|
Joe Woodbury wrote: Subversion
That has been very dependable and reliable for everyone right?
Vasudevan Deepak Kumar
Personal Homepage Tech Gossips
The woods are lovely, dark and deep,
But I have promises to keep,
And miles to go before I sleep,
And miles to go before I sleep!
|
|
|
|
|
I have had more than enought issues with subversion. Currently I have file that subversion thinks needs to be added, but is already there. I have had to download clean versions several times because subversion gets confused and will not clean up.
I also hate that I cannot save change sets.
|
|
|
|
|
There are versions of svn out there that have change sets.
If your actions inspire others to dream more, learn more, do more and become more, you are a leader.-John Q. Adams You must accept one of two basic premises: Either we are alone in the universe, or we are not alone in the universe. And either way, the implications are staggering.-Wernher von Braun Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.-Albert Einstein
|
|
|
|
|
Companies I have worked for obviously have not used those versions.
|
|
|
|
|
|
I have had this happen with SVN and GIT as well. I don't hear you complaining about those.
|
|
|
|
|
Adding clearcase[^] to this. There is not one versioning system that I have worked with that could actually handle the real merges. Sorry, those go by hand.
modified 26-Mar-13 12:03pm.
|
|
|
|
|
Dexterus wrote: I have worked with that could actually handle the real merges
Subversion with WinMerge could do most of the things. Do not go with the default merge tool of SVN. That is poor.
Vasudevan Deepak Kumar
Personal Homepage Tech Gossips
The woods are lovely, dark and deep,
But I have promises to keep,
And miles to go before I sleep,
And miles to go before I sleep!
|
|
|
|
|
Not used this combo but if it involves WinMerge's diff algorithms, I've had diffs butchering the code, not as much as other tools though. It's my goto Windows diff tool. Good for code reviews
|
|
|
|
|
Could be a bug as a result of merge issue with clearcase codebase itself, not sure what versioning tool they use
|
|
|
|
|
We use Perforce, which we have never had a problem with, including Merges.
Regards
Graham Wade
|
|
|
|
|
I used it for 5/6 years without much problem.
If you want to see bad, use VSS and elect the way of pain.
|
|
|
|