Re: Revision Graph and merges

On 30 June 2011 10:30, Brendan Flanagan
<brendan.flanagan_at_wegobeyond.co.uk> wrote:
> Hi,
>
> I am getting confused and hope that someone on this list can enlighten me.
>
> If we have a standard repository setup (trunk/branches/tags) – and the main
> line development happens in trunk, we then (periodically) branch to create a
> stable production release.  The release is live and a tag is created,
> development continues on the trunk.  A couple of emergency fixes are
> required to the prod release and these are done on the prod branch, tested
> and released (and tagged).  If we then merge those changes back to trunk we
> expected to see that in the revision graph – but we can’t seem to find a way
> to show the merge?
>
> Alternatively is there a way in TSVN to work out what has merged to where?
> Or (kind of related) – what hasn’t been merged to trunk yet?

The revision graph shows copy operations, so it will show branch and
tag creation, but it doesn't (yet) show merges. There is a pending
issue for that feature but it is not easy to implement and is not
likely to be in until version 1.8 at least.

If you show log for the trunk and check 'include merged revisions' at
the bottom it should show the branch changes in grey.

If you look at the svn:merginfo property for trunk then you should be
able to see the revs that have been merged.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2781892
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].