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

Re: Merge dialog

From: Stefan K├╝ng <tortoisesvn_at_gmail.com>
Date: 2007-10-19 19:02:17 CEST

Jean-Marc van Leerdam wrote:
> Stefan,
>
>
> On 18/10/2007, Stefan K├╝ng <tortoisesvn@gmail.com> wrote:
>> Please post your ideas here, anything is allowed - I'm desperate
>> because I really don't like the way it looks right now...
>>
> First off: I am not experienced in merging, so some remarks may be
> off the mark. But perhaps the input of a merge-noob helps in some
> way.
>
>> <snip> 1) merge a revision range: one source url, start and end
>> revision (maybe a peg revision)
>
> A use case for this is: 'this (bug)fix from trunk should also go into
> branch X', right?
>
> I would expect to have to supply a URL pointing to the source and a
> From/Through range of revisions (possibly a non-contiguous list of
> revision numbers). The merge is applied to my Working Copy
>
> Getting a list of revisions that have affected the source URL and
> letting me select the revisions is expected in this case.

This is much easier done from the log dialog:
* show log for the trunk
* select the revisions you want to merge to branchX
* right-click, choose "Merge revisions to..."
* choose the branchX folder on your harddrive
* wait for the merge to finish.

>
>> 2) merge the difference between two urls: two source urls with each
>> having a revision
>
> A use case for this is: 'branch development is done, lets move the
> change into trunk' right? And it should 'automatically' work even if
> the branch has received merges as described in option 1)?

Yes, that's exactly what this is used for.

>> For merging a revision range, with merge tracking we can find out
>> the source url - but that can take minutes if the server doesn't
>> know merge tracking yet.
>
> Do you have a way of determining if the server knows about merge
> tracking, and just not support the extended merge stuff in that case?

Unfortunately, no. Subversion doesn't export such an API.

> Oh, and what would be a use case for 'reverse merging'? I don't
> understand what that would do.

Reverse merges are used to revert changes. This is usually done from the
log dialog when you choose "revert changes from this revision" - that
function does a reverse merge.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 19 19:02:33 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.