>
> I think the cheap-copy 'tag' still works for this.
>
Yes, I think so.
What you would track in comment can be managed with specific tags.
Hope the following explanation is clear (and correct as well).
Let's name T the trunk, B a branch and L labels root.
Initially, at revision Rt0, the trunk is copied to L/snapshot_for_branch.
Then B is created copying form L/snapshot_for_branch.
Now T and B go on independently.
At a certain revision on the trunk, namely Rt1, a copy is taken to
L/mergesrc_T_B_0 (the log entry indicates from T:Rt1).
When it's time to merge THAT revision on the trunk into B, first make
a copy of B to L/premerge_T_B_0.
Then svn merge Rt0:Rt1 URL_OF_T <wc of B>
svn commit
Make a copy of B to L/postmerge_T_B_1.
Again, T and B go on independently.
When it' time to merge T in B again, the trunk is copied to L/mergesrc_T_B_1
(the log entry indicates from T:Rt2).
B is copied to L/premerge_T_B_1 and now it's time to find the revision args
for merge command.
In general, issue svn log on L and get mergesrc_T_B_x from revision indication, e.g. Rtn.
Get mergesrc_T_B_(x-1) from revision indication, e.g. Rtm.
Issue svn merge Rtm:Rtn URL_OF_T.
Commit, mark end of merge in L, etc.
In this way ther is no need to save in a non-versioned way the revisions at which
the merge occurred.
This, obviously, works if T in entirely merged in B.
I think that it works also alternating merge from B to T (swapping the roles of B and T).
Guido.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 8 09:24:35 2004