Re: r3195 - /branches/multi_processor/ -- March 15, 2007 - 11:00

Edward d'Auvergne wrote:

> On 3/15/07, Gary S. Thompson <garyt@xxxxxxxxxxxxxxx> wrote:
>
> > Edward d'Auvergne wrote:
> >
> > > Hi,
> > >
> > > I would actually make the branch from just before r3023 in the 1.3
> > > line.  This will avoid the tag specific changes which went into
> > > 'tags/1.3.0'.
> > >
> > > Cheers,
> > >
> > > Edward
> > >
> > Hi Ed or should I say good morning?
> >     what are the tagspecific changes and why would i need to avoid them?
>
>
> There are a few small things.  First is the commit for the version
> specific entry of the CHANGES file as this commit was subsequently
> ported to the 1.3 line.  Hence if you later on ported all the changes
> of the 1.3 line you would have this commit applied twice causing
> conflicts.  Secondly the file 'version.py' in the base directory has
> been changes and the relax docs updated to reflect this version
> number.  So this would need to be removed.  It would be easier copy
> the 1.3 line at the branch point revision number.
>
>
> > regards
> > gary
> >
> > n.b. what should I do snv delete followed by svn cp using a specific
> > revision and if so what revision would you go for I am not quite
> > working  out how to follow the full set of revisions for the 1.3 line
> > and where to stop
>
>
> By using the --stop-on-copy argument to 'svn log' on the 1.3.0 tag,
> you can see at which revision the tag occurred at:
>
> $ svn log --stop-on-copy 
> svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.3.0
>
> You can then simply copy the 1.3 line at that revision, after deleting
> the other branch:
>
> $ svn rm svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/my_branch
> $ svn cp -r3023 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
> svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/my_branch
>
>
> > n.b. 2 This very much a prototype line and my expectations is that it
> > will never be merged with or that only a few files will be merged and
> > the rest of the revisions will be forwardported by hand. So as long as
> > the revision I have grabbed works that shouldn't be a problem?
>
>
> In a private branch you are free to use which ever branch/main
> line/tag you wish at any revision.  How and whether or not the
> revisions of that branch get into the main lines is another question.


of course ;-)

> I not would recommend branching from one of the tags though as this is
> unnecessary (although it could be useful in other contexts).

Fine and fair enough. I presume subsets of a branch can also be merged 
back if needed or doesn't that work?

> Cheers,
>
> Edward
>
> .


--
-------------------------------------------------------------------
Dr Gary Thompson
Astbury Centre for Structural Molecular Biology,
University of Leeds, Astbury Building,
Leeds, LS2 9JT, West-Yorkshire, UK             Tel. +44-113-3433024
email: garyt@xxxxxxxxxxxxxxx                   Fax  +44-113-2331407
-------------------------------------------------------------------