perl-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Orton <jor...@redhat.com>
Subject Re: syncing branches with trunk, how?
Date Tue, 17 May 2005 15:06:26 GMT
On Tue, May 17, 2005 at 11:02:17AM -0400, Stas Bekman wrote:
> Joe Orton wrote:
> >On Fri, May 13, 2005 at 11:58:05AM -0400, Stas Bekman wrote:
> >
> >>Joe Orton wrote:
> >>
> >>>the script does the merge from between 165203 and HEAD of the trunk into
> >>>that working copy, and resets the merge-point property to the revision
> >>>number of the HEAD, ready for next time.  So finally you just commit the
> >>>working copy.
> >>>
> >>>Does that make sense?
> >>
> >>/home/stas/apache.org/mp2-no-clone> svn propset merge-point 165203 .
> >>property 'merge-point' set on '.'
> >>
> >>/home/stas/apache.org/mp2-no-clone> ./svn.remerge
> >>./svn.remerge: merging from trunk from r165203 to r
> >
> >
> >...beats me, works OK here.  What does:
> >
> >  $ svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL: //;p}'
> >
> >produce for your working copy of the branch?  Nothing?  And just "svn
> >info ."?  What version of svn are you using?  I'm using 1.1.4.
> 
> % svn info . | sed -n '/^URL/{s,/branches/.*,,;s/^URL://;p}'
> https://svn.apache.org/repos/asf/perl/modperl/trunk

That's the trunk, not a branch.  The script should be run from a 
checkout of the *branch* which you're trying to merge into.

(unless we are talking completely at cross purposes - my script can be
used to ease maintenance of a branch which needs to be merged from the
trunk periodically.  Not the other way round...)

joe

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Mime
View raw message