"Thomas Charron" <twaffle_at_gmail.com> wrote on 05/29/2008 06:44:15 PM:
> Hello everyone.
>
> I downloaded the 1.5 nightly build today after upgrading my testing
> development server to the subversion 1.5 RC, as I really wanted to
> take a look at the new merge tracking capabilities, both serverside
> and in TortoiseSVN. After a few initial tests, I did notice that the
> Revision Graph created by TortoiseSVN never shows when a branch is
> reintegrated, which I would assume would create a connection back to
> the trunk.
>
> Will it show these, and I've simply configured and/or done something
> wrong? The trunk does have the attribute that it has had the branch
> merged.
Due to restrictions in the 1.5 API, it is hard to retrieve
the required information. Thus, there is no merge info in
the 1.5 revision graph.
The only indication that a branch has (probably) been merged
is that it has been deleted. Hovering over the respective
red revision node will show its commit message. Depending on
your development rules it may say something like "closing
xyz development branch after merging all its changes into
/trunk".
There is an open issue for 1.6 to add merge tracking to the
revision graph. Actually, I have some ideas how to turn it
into a powerful merge tool. That depends on SVN API changes
and the time available until 1.6: My guesstimate is that it
will take me at least 1 year to get it done.
Issue tracker link:
http://issues.tortoisesvn.net/index.php?do=details&task_id=371&project=1
-- Stefan^2.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-05-29 21:49:24 CEST