[Svnmerge] setting up new development branch
kirean at gmail.com
Thu Jan 15 04:22:41 PST 2009
You can specify the source?
svnmerge.py -S trunk avail -l
Cheers / Erik
On Wed, Jan 14, 2009 at 12:55 PM, Jon Schewe <jpschewe at mtu.net> wrote:
> I've created some development branches off of my trunk and I've been
> happily merging back and forth. Now a new developer is on the project
> and I created a new developer branch for him by using svn copy. I then
> did svnmerge.py init in his branch and svnmerge.py init <branch path> in
> trunk. Now in the new developer branch when I do svnmerge.py merge I'm
> prompted for which source I should use as all of the merge sources from
> the trunk are there. Do I need to uninit each branch from the developer
> branch? Or is there some other way to handle this?
> Jon Schewe | http://mtu.net/~jpschewe <http://mtu.net/%7Ejpschewe>
> If you see an attachment named signature.asc, this is my digital
> signature. See http://www.gnupg.org for more information.
> For I am convinced that neither death nor life, neither angels nor
> demons, neither the present nor the future, nor any powers,
> neither height nor depth, nor anything else in all creation, will
> be able to separate us from the love of God that is in Christ
> Jesus our Lord. - Romans 8:38-39
> Svnmerge mailing list
> Svnmerge at orcaware.com
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Svnmerge