[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: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: 2007-10-19 11:31:25 CEST

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.

> 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)?

>
> 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?

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

-- 
Regards,
Jean-Marc
----------------
    ___ 
   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
 <\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out http://tortoisesvn.org
Received on Fri Oct 19 11:31:33 2007

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