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

Re: Merge doesn't initialize with Explorer selected file

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-12-05 18:39:09 CET

Doug Hockin wrote:
> If I select a file in Explorer, right click and select Commit, the
> dialog uses my file selection. But if the selected operation is Merge it
> disregards my selection and fills in what was used in the last Merge.
> This is very non-intuitive to me. Maybe it has something to do with the
> TSVN's Merge not supporting the modes of SVN Merge where you can specify
> working copies rather than repository URLs? It seems like the way it is
> now requires a lot more manual work on my part than it should.

That's expected behavior. When you do a merge, the URL shown in the
merge dialog is usually something different than the URL of the item you
right-clicked in the working copy (usually, you merge something into
your working copy from a different branch - for reverse-merges and
undoing changes there's an option in the log dialog).

That's why the merge dialog shows the last used URL from a merge. It's
more common that this URL is the one the user wants.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Dec 5 18:39:32 2007

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

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