On 30 June 2011 12:00, Brendan Flanagan
<brendan.flanagan_at_wegobeyond.co.uk> wrote:
> Simon - thanks for the reply - a couple of other comments/questions below...
>
> On 30 June 2011 11:17, Simon Large
> < simon.tortoisesvn_at_gmail.com > 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.
>
> I like the sound of "yet" that would be a cracking feature - it would be great
> if the graph could show lines from the branch back to the trunk (in our example).
> I did look at SvnMapper but it keeps crashing so I gave up (it looked promising
> on the svnmapper.tigris.org page too)
>
>
>> If you show log for the trunk and check 'include merged revisions' at
>> the bottom it should show the branch changes in grey.
>
> DOH! I completely forgot about that option.
>
> The reverse option could be useful too? i.e. show me the "yet to be merged"
> revisions (well it would in our scenario/setup) is that possible via TSVN?
>
>> If you look at the svn:merginfo property for trunk then you should be
>> able to see the revs that have been merged.
>
> Excellent - I forgot all about that property.
>
> I guess what I want to be able to do is compare the "Prod" branch to the "trunk"
> and (somehow) get a list of revisions that exist in the prod branch that haven't
> already been merged to trunk (or vice-versa the ones that have) - I have been up
> and down TSVN menus and can't seem to be able to get the list I want - or I am
> just looking in the wrong place?
Provided you have been using merge tracking then I think that if you
just use the merge dialog and tell it to merge everything it will work
out what has not yet been merged. Not sure if it tells you the
revisions before doing the merge though. You'll have to try it and
see.
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=2781902
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-30 13:48:40 CEST