Bradley Wagner <bradley.wagner@hannonhill.com> wrote on 08/28/2006
01:58:44 PM:
> Thanks for the response Mark. Have you guys considered adopting
> different dev/release practices to get around this?
>
> I was thinking that one thing to do would be to tag from the trunk
> and then branch for the release immediately afterwards. Of course,
> all subsequent releases in the branch would not appear.
I am less concerned with how the information appears in the History view,
then I am with having sound release practices. Branching for a release
and then stabilizing with selective backports from trunk works for me. In
trunk, I have an entry for when the branch was created, and in the branch,
I have entries for all of the tags.
If I want to compare trunk with a tag, I just have to select the branch in
the dialog. This causes the correct URL for the branch to be loaded in
the dialog. If I then click the Show Log button, I see the History for
the branch, which includes the tags. I then select the tag to get the
correct revision, and I get an accurate URL/Rev combo for doing a compare.
I do not think there is a perfect solution. In real world development,
there are going to be cases where trunk is going to significantly diverge
from the branch, and in that case there is no entry in the history of
trunk that reflects a revision in the branch/tag. For example, suppose
you make a branch at r3. Trunk is changed in r4, 5, and 6. r5 is
backported to the branch in r7. And a tag is made in r8. In this
scenario, the branch contains trunk @ r3 + the change in r5. Trunk itself
does not have a similar item, as r5 also has the changes made in r4 and
HEAD has the changed made in r6. So technically, there is no version of
trunk that has been released to the branch/tag.
In Subversion 1.5, some of this info about what has been merged will be
available. It will definitely be available internally to the merge
engine, it is hard to say right now if it will be accessible in any
meaningful way to the UI.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Aug 28 20:22:00 2006