subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thorsten Schöning <tschoen...@am-soft.de>
Subject Re: Strange behavior
Date Tue, 13 Aug 2013 14:15:26 GMT
Guten Tag John Maher,
am Dienstag, 13. August 2013 um 15:39 schrieben Sie:

> Follow the book on how it instructs to import a project then
> it becomes impossible to merge and branch.

Branching is always possible and always equally cheap regardless of
what you did before, because it breaks down to a cheap copy operation
with preserving history. The only thing which may cost time is
updating/checking the new branch out.

If you have merge problems because of your tests or whatever one
solution may be just recording merge info. This way you can move and
copy and delete things in any way you like and make subversion think
that those changes are already applied to a selected directory without
really applying them, meaning you won't get any merge conflicts now or
later from the revisions you recorded as already merged. This may
prevent re-creating your repo and losing history.

http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.blockchanges

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening@AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/

Telefon...........05151-  9468- 55
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


Mime
View raw message