Mark Phippard wrote:
> On Mon, Oct 26, 2009 at 6:02 PM, Tom Walter <tom.walter_at_hitwise.com> wrote:
>
>> Thanks Mark. I didn't know about the shift-select feature. That is great.
>>
>> I am using the collabnet merge client, however this dialogue still appears
>> when you choose the "merge two different trees" option.
>>
>
> Are you saying the problem exists when using that option? It
> shouldn't as in the merge two trees scenario the revisions are not
> from the same tree. If your server is on SVN 1.5+ it should be really
> rare to even need to use that merge option.
>
Yes it exists with that option. My server is not 1.5 so I was using this
to revert a change, because I didn't realise about the revert feature in
the history view. Which is also awesome. Thanks.
>
>> Incidentally, even with the shift-select feature, one use case that this
>> dialogue doesn't really cover is when you want to roll something back, ie
>> merge from a later revision to an earlier one to remove some change. It
>> always assumes that the earlier revision is the FROM and the later the TO.
>> However that's a minor niggle and occurs rarely enough its no problem to
>> just enter them manually in that case.
>>
>
> We still choose to perform reverse merges from the History view.
> Basically, you choose the revisions you want to back out from the
> History view and take option to revert those revisions.
>
>
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2411548
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-10-26 23:44:33 CET