RE: Problem with merging
From: John Maher <JohnM_at_rotair.com>
Date: Thu, 13 Sep 2012 09:35:27 -0400
While its true that I didn't technically lose code, it was probably in there somewhere. The loss was discovered weeks later and we have a lot of code. It would take days going over everything then we would have to *hope* we got everything. Some things would let us know if we missed them, others things may not. We could go days or weeks before we noticed we were losing data. Since we were a few weeks away from the next release I decided to put off updating production. Basically it would cost too much to possibly not get all the code sprinkled with a slim chance of data loss. So from a business perspective, the code was lost.
In reality we should've had code control a long time ago. I only got here a few years ago. And when I first got here I met extreme resistance about incorporating something like subversion. I finally got the green light, quite possibly because they didn't have to spend any money. Now I must learn to use it. :)
Revisions are global is what I needed to know, thanks.
Guten Tag John Maher,
> I started using subversion a while back and doing a merge I lost a bunch
Unless you didn't commit, you can't loose source code, that's what
> I now have a stable code base and wish to use subversion so I tried to
If you mean your later mentioned conflicts with "failed", this isn't
> 1) I was on revision 4. I then branced it, made a change and it
Yes, revisions are global, that's one of the fundamental concepts of
Mit freundlichen Grüßen,
-- Thorsten Schöning E-Mail:Thorsten.Schoening_at_AM-SoFT.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon.............030-2 1001-310 Fax...............05151- 9468- 88 Mobil..............0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas MuchowReceived on 2012-09-13 15:37:36 CEST
This is an archived mail posted to the Subversion Users mailing list.