Daniel Becroft writes:
> We've only just started using feature branches, and most of the time, our
> merges are one way (trunk -> branch), until, eventually, we need to
> reintegrate (or just dump the branch). One the few occasions that a branch
> -> trunk is required, we just do it manually. Le
Richard Hansen at BBN wrote a wrapper to let people with accounts run
svn as the repo owner but with the tunnel user argument.
http://svn.apache.org/repos/asf/subversion/trunk/contrib/server-side/svnstsw/README
pgp98x4bM7E1f.pgp
Description: PGP signature
Daniel Becroft writes:
> On Thu, Apr 29, 2010 at 6:45 PM, Joël Conraud wrote:
>
>> Like yourself, I initially though that it would be able to deal with this,
>>> but it doesn't seem to (and there is probably a very good reason why it
>>> can't).
>>>
>>
>> I would be interested in knowing this
I see you figured this out, but what I do is
initial import:
import v1 to vendor/v1
copy vendor/v1 to vendor/trunk
copy vendor/trunk to trunk
nth import:
import vN to vendor/vN
merge --ignore-ancestry vendor/v(N-1) vendor/vN to vendor/trunk
# note that now we have a vendor branch with st
