[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem with merging

From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Wed, 12 Sep 2012 20:38:31 +0200

Guten Tag John Maher,
am Mittwoch, 12. September 2012 um 19:39 schrieben Sie:

> I started using subversion a while back and doing a merge I lost a bunch
> of source code which prohibited me from updating production for weeks.

Unless you didn't commit, you can't loose source code, that's what
version control is all about. Even if you didn't commit Subversion
would always try everything to preserve your current modifications,
which may result in the conflicts you describe later. The easiest way
to never ever loose anything it always commit before doing any
changes to your working copy like merges and whatever goes wrong after
a commit can be restored.

> I now have a stable code base and wish to use subversion so I tried to
> follow chapter 4, branching and merging. It failed.

If you mean your later mentioned conflicts with "failed", this isn't
exactly true, as a conflict is a normal operation and the merge may
succeed. Conflicts only mean that there are changes which Subversion
can't merge automatically safely and the user needs to do something to
merge the changes. This is not the same as an error during the merge
or else.

> 1) I was on revision 4. I then branced it, made a change and it
> jumped to revision 7. Why? Does the revision apply to all folders
> under a repository?

Yes, revisions are global, that's one of the fundamental concepts of
Subversion and is normally considered as a major benefit over previous
centralized version control like CVS.

Mit freundlichen Grüßen,

Thorsten Schöning

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 Muchow
Received on 2012-09-12 20:39:07 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.