Re: branching strategies in subversion
Jes,
I think what you might want is svn copy versus svn merge. An svn merge
would keep changes from changesetA and changesetB and a copy would keep
changes just from changesetB.
-Pat
On Mon, Nov 28, 2011 at 3:43 AM, jes Struck wrote:
>
> no what i wanted to do was
>
> https://sites.google.com/a/praqma.net/howto/subversion/branching-strategies
>
> im pretty sure this would solve my issues.
>
>
>
> *Jes Struck*
> Consultant
> Praqma A/S
>
> Tel:+45 22 71 82 46
>
> Mail: j...@praqma.net
>
> web: www.praqma.net
>
>
>
> On 28 November 2011 11:24, Stephen Butler wrote:
>
>>
>> On Nov 28, 2011, at 10:11 , jes Struck wrote:
>>
>>
>> Hej
>>
>>
>> I started to investigate the branching strategies of subversion. to
>> compare with Git, Mercurial and ClearCase.
>> These three tools have an opportunity to branch out in a developer branch
>> from
>> which to deliver the trunk several times, so that such branches may be
>> seen as developers industry instead of features industry. In Subversion,
>> it seems that the second time you try to deliver the subversion dispose
>> of any changes you've ever made any page on this branch
>>
>>
>> By "deliver", I presume you mean a reintegrate-merge, like
>>
>> svn merge --reintegrate ^/branches/mydevbranch
>>
>>
>>
>> So that second time i deliver it tries to deliver changes from Both
>> Changeset A and B
>>
>> i would rather have it only took Changeset B?
>>
>> is this me that does not now how the correct way is to due it?
>>
>>
>> You can "revive" your branch (via the "svn merge --record-only" command)
>> after the first reintegration is committed to trunk (or wherever you
>> copied
>> your developer branch from). This is described in the SVN Book at
>>
>>
>> http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
>>
>>
>> Tip: Your diagram shows only merges _from_ the developer branch. To
>> minimize merge conflicts, merge _to_ your developer branch early and
>> often.
>>
>>
>> http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync
>>
>> Regards,
>> Steve
>>
>> --
>> Stephen Butler | Senior Consultant
>> elego Software Solutions GmbH
>> Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
>> tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
>> fax: +49 30 2345 8695 | http://www.elegosoft.com
>> Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
>> Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
>>
>>
>>
>
--
Regards,
Patrick Burma
Solutions Architect
WANdisco, Inc.
Office: 925-396-1107
Mobile: 303-242-2608
http://www.wandisco.com
[image: Dreamweaver-11.png]
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com <http://www.ubersvn.com/>
Everything you need to deploy Subversion in the Enterprise
http://www.wandisco.com/subversion<http://www.wandisco.com/subversion/multisite>
Subversion community
http://www.svnforum.org
Read our blogs
http://blogs.wandisco.com/
Follow us on Twitter
http://www.twitter.com/wandisco
THIS MESSAGE AND ANY ATTACHMENTS ARE CONFIDENTIAL, PROPRIETARY, AND MAY BE
PRIVILEGED. If this message was misdirected, WANdisco, Inc. and its
subsidiaries, ("WANdisco") does not waive any confidentiality or privilege.
If you are not the intended recipient, please notify us immediately and
destroy the message without disclosing its contents to anyone. Any
distribution, use or copying of this e-mail or the information it contains
by other than an intended recipient is unauthorized. The views and
opinions expressed in this e-mail message are the author's own and may not
reflect the views and opinions of WANdisco, unless the author is authorized
by WANdisco to express such views or opinions on its behalf. All email
sent to or from this address is subject to electronic storage and review by
WANdisco. Although WANdisco operates anti-virus programs, it does not
accept responsibility for any damage whatsoever caused by viruses being
passed.
<>
Re: svnsync many repos?
Well there's the svnadmin hotcopy command but that's not incremental, and
there's an incremental option with the svnadmin dump but you have to set
that up per repository. I would maybe look into using svnsync to create a
mirror as per what this guy says:
http://link2caro.net/read/backup-your-svn-repository-with-svnsync/
-Pat
On Wed, Nov 30, 2011 at 4:58 PM, Les Mikesell wrote:
> Rsync isn't guaranteed to work if the repo changes during the copy.
> But that's the effect I want - just duplicate everything to the backup
> instance efficiently.
>
> -Les
>
> On Wed, Nov 30, 2011 at 5:19 PM, Patrick Burma
> wrote:
> > If I am understanding the question properly then I think rsync will do
> the
> > job.
> > -Pat
> > On Wed, Nov 30, 2011 at 4:08 PM, Les Mikesell
> wrote:
> >>
> >> If you have a large number of separate repositories in a common
> >> top-level directory being served by http or a single svnserver, is
> >> there a generic way to do backups that will track new additions?
> >>
> >> --
> >> Les Mikesell
> >>lesmikes...@gmail.com
> >
> >
> >
> >
>
--
Regards,
Patrick Burma
Solutions Architect
WANdisco, Inc.
Office: 925-396-1107
Mobile: 303-242-2608
http://www.wandisco.com
[image: Dreamweaver-11.png]
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com <http://www.ubersvn.com/>
Everything you need to deploy Subversion in the Enterprise
http://www.wandisco.com/subversion<http://www.wandisco.com/subversion/multisite>
Subversion community
http://www.svnforum.org
Read our blogs
http://blogs.wandisco.com/
Follow us on Twitter
http://www.twitter.com/wandisco
THIS MESSAGE AND ANY ATTACHMENTS ARE CONFIDENTIAL, PROPRIETARY, AND MAY BE
PRIVILEGED. If this message was misdirected, WANdisco, Inc. and its
subsidiaries, ("WANdisco") does not waive any confidentiality or privilege.
If you are not the intended recipient, please notify us immediately and
destroy the message without disclosing its contents to anyone. Any
distribution, use or copying of this e-mail or the information it contains
by other than an intended recipient is unauthorized. The views and
opinions expressed in this e-mail message are the author's own and may not
reflect the views and opinions of WANdisco, unless the author is authorized
by WANdisco to express such views or opinions on its behalf. All email
sent to or from this address is subject to electronic storage and review by
WANdisco. Although WANdisco operates anti-virus programs, it does not
accept responsibility for any damage whatsoever caused by viruses being
passed.
<>
Re: What is the easiest way to copy an existing Subversion Repository to another server?
Hey Craig, probably the best way is to do export/import using the svnadmin dump and load commands. svnbook has a little guide on this scenario you can see here. http://svnbook.red-bean.com/en/1.7/svn.reposadmin.maint.html#svn.reposadmin.maint.migrate -Pat On Tue, Dec 13, 2011 at 9:23 PM, Craig Burlock wrote: > Hello all, > > I need to create a new clone of an existing Subversion Repository to run > on a new server. What is the easiest way of doing this? > > I haven't done this before and any help would be very much appreciated. > > Thanks. >
Re: LDAP authz aliases with svn+ssh
You might try this to sync your authz file to an ldap group, it will write in the entries for you, nice way to avoid issues with syntax perhaps? http://www.thoughtspark.org/node/26 Never used it myself, meant to try it, but I've heard good things. -Pat On Thu, Jan 5, 2012 at 3:07 PM, Owen Loy wrote: > Hi there, > > I'm wondering if my desired setup is possible: > > 1. Using svn+ssh > 2. Using pam_ldap to handle SSH access > 3. Using authz-db to handle ACL (against LDAP accounts) > > I'm running into a problem with #3. My current test setup is as follows: > > svnserve.conf: > - > [general] > authz-db = authz > ... > > authz: > - > [aliases] > svnaccess = CN=svngroup,CN=groups,DC=example,DC=com > > [/] > &svnaccess = rw > > With this setup, SSH is no problem (file permissions are correct, LDAP > works fine, etc...), but SVN returns Not Authorized. To debug, I tried the > following scenarios: > > authz with "local" user (works): > > [/] > user1 = rw > > > authz with LDAP alias for specific user (does not work): > > [aliases] > svnaccess = CN=user1,CN=users,DC=example,DC=com > > [/] > &svnaccess = rw > > Has anyone run this sort of setup successfully, or is able to determine > what I'm doing wrong? I'm 99% sure the DNs are correct (in that they work > for SSH purposes, and other non-related issues), but don't seem to work > within the authz file, even though the docs suggest it should. > > Thanks! >
