[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tortoisesvn-dev
Subject:    "Checkout..." context menu in log dialog when "Include merged
From:       Joseph Galbraith <galb () vandyke ! com>
Date:       2010-07-22 18:14:29
Message-ID: 4C488A85.6070704 () vandyke ! com
[Download RAW message or body]

We're (finally) starting to use merge tracking feature more
here, and I spotted a couple of things that didn't work
the way I expected.  (Of course, it might be my expectations
that are wrong...)

In the log dialog, I have the "Include merged revisions" check
box checked.

Then, I right click on a revision that was merged from another
branch and do "Checkout..."

The "Checkout" dialog uses that path that I display the log
dialog for, and the revision number of the change.

I expected it to put in the source of the merge (since that is
what would be required to get a checkout of that revision.)

Also, there is a similar problems in the "Update Item To
Revision".  In this case I get an error because the path
I've got shown in the log file didn't exist at the revision
that was merged, so the update to revision fails.

In this case, I would expect it to switch me to the merged
path and then update, possibly with a warning because the
switch might be unexpected.  Maybe something like:

"This revision was merged from svn+ssh://host/branches/name.

 In order to update your working copy to this revision,
 it needs to be switched to source path for the merge.

 Do you want to continue?"

I'm using 1.6.8, so there is some possibility that this has
already been addressed, but I don't remember it coming up on
the list, and I can't easily try out the nightlies.

Thanks,

Joseph

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2637012

To unsubscribe from this discussion, e-mail: [dev-unsubscribe@tortoisesvn.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]