[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TSVN - Merge Tracking

From: Daniel Becroft <djcbecroft_at_gmail.com>
Date: Tue, 10 Nov 2009 10:01:10 +1000

On Tue, Nov 10, 2009 at 9:04 AM, Bob Archer <bob.archer_at_amsi.com> wrote:
>> On Tue, Nov 10, 2009 at 8:47 AM, Bob Archer <bob.archer_at_amsi.com>
>> wrote:
>> > IF you do the following:
>> >
>> > o Right click on your WC
>> > o Select Merge
>> > o Leave Merge Type of Merge Range of Revisions
>> > o Click Next
>> > o Specify a URL to merge from
>> > o Click "Show Log"
>> >
>> > It is here where you will see the already merged in revisions as
>> grayed out. I think you will have to specify the "INclude merged
>> revisions" at the bottom to see the grayed out ones. Otherwise it
>> will only show revisions that are eligible to merge.
>> Thanks, Bob. When I view the "Show Log" of the URL to merge from, I
>> see all revisions (including ones that have already been merged).
>> The
>> "Include merged revisions" option does not seem to do anything with
>> the log for the source. If I use that option on that target though
>> (the branch where I have already merged revisions into), then it
>> includes the log of the merged revisions. This seems to be
>> consistent
>> with the TSVN help (4.9.6 Merge Tracking Features), and the manual.
> Right, wouldn't you always start your merge by right click on the target? I should have said that as the first step... you right click on the merge target working copy.... as that is the location that TSVN will read the mergeinfo from.

I have always been initiated the Merge command from right-clicking on
the target WC.

Daniel B.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-10 01:01:37 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.