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

Re: [TSVN] what happened to the default merge From URL

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-06 19:25:23 CEST

Daniel Atallah wrote:
> So, today, I realize that another set of changes in a different part
> of the application are ready to be merged, so I go to the directory
> where I want to do the merge:
> c:\devel\LampertProject\dev\stable\MainApp\Applets\RateEdit\src\com\somecompany\coredit
> This corresponds to:
> http://svn/branches/RLS_6-5-5/Lampert/MainApp/Applets/RateEdit/src/com/somecompany/coredit
> on the server.
> I right-click on the "coredit" directory and choose "Merge". Now, in
> the "From" URL, instead of seeing
> "http://svn/branches/RLS_6-5-5/Lampert/MainApp/Applets/RateEdit/src/com/somecompany/coredit",
> it says "http://svn/branches/RLS_6-5-5_test/Lampert/MainApp/Integration/src/com/somecompany/intg/customer/customername/inbound"
> (the last place that was merged from).
> So, what needs to be done, is to replace the URL with the current WC
> URL and then replace the branch name ("RLS_6-5-5") with the testing
> branch name ("RLS_6-5-5_test") before I can enter the revisions
> (25319:25325) and do the merge.

OK, that makes more sense now.

Let me outline another common use case:

Following TSVN 1.1.3 release some bugfixes need to be ported across from
trunk to make the 1.1.4 release. These affect various bits of TSVN, so
they are spread all over the tree.

Switch working copy to branches/release_1.1.3 (same level as trunk)
Merge r2580 from trunk
Merge r2636 from trunk
Merge r2682 from trunk
...
So in this case, having the URL flip back to the branches URL is a pain.

Whichever way we do this someone is going to be upset.

1. Add a button to copy the WC URL to the From URL.
That's another button in the merge dialog, and I am not sure that its
use is very intuitive.

2. Your suggestion, always start with From URL == WC URL.
That works for everyone, but it is extra clicking for our use case to go
back to the last-used URL. Is it more intuitive? I don't know.

3. Add a settings option to select between last-used URL and WC URL.
The settings dialog is already overcrowded, and you don't want to
mention options while Stefan is listening.

4. Save the last-used WC URL. On next merge, if the WC URL is the same
as last time, pick the last-used From URL. Otherwise pick the WC URL.
This one has some mileage, and no additional UI required. Might be
awkward to explain, but no more so than option 2.

Thoughts anyone?

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
Received on Wed Jul 6 19:24:58 2005

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