[TSVN] Re: Merging from deleted branch to trunk

SteveKing wrote:
> Will Dean wrote:
>> Yes, it's a lousy half-baked feature, so perhaps having a lousy
>> half-baked name for it is actually appropriate.
>
> I don't think it's a half baked feature, and I definitely don't think
> it's lousy. It does what it is intended for: it shows the user what to
> expect in a merge.

There is really not much else you could expect it to do. If you want to
see an actual preview it would have to modify the files for real. It
might be possible to do something with temp files for a small merge, but
it's equally possible that a merge could change every file in your WC.
Listing the changed and conflicted files seems the best solution to me.
If nothing else it is a good check that you have actually picked the
right revision numbers.

>> I suspect that the 'design by committee with SK's veto' approach is
>> going to mean that nothing ever gets changed in the merge dialog, so
>> I shall probably give-up talking about it soon.

The only reason I walked away from the dicussion was that it became
clear that there was no simple fix to satisfy everyone, and I wanted
people to get back to bug-hunting for 1.1.3. My fault, I should have
said that at the time.

> Another point: making it easier for users to understand merging is
> definitely a good idea. But _never_ do it so that certain cases aren't
> possible anymore (for example by assuming something which should be
> configurable).

I don't think any of the proposals so far reduce the functionality.

> After 1.1.3 got released, I will post here some suggestions on how _I_
> think the dialog could be improved, using a lot out of this weeks
> discussions. You then can comment on that and maybe we can come to an
> agreement. If not, well then the dialog will have to stay as it is
> until we do. Because I refuse to change something just to have to
> change it over and over again...

Yep. Let's get 1.1.3 sorted first, then see if we can come up with some
better ideas which we can agree on.

Simon

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