SteveKing wrote:
>On Mon, 24 Jan 2005 21:16:07 +1100, Peter McNab <mcnab_p@melbpc.org.au> wrote:
>
>
>> Would the words "Select revisions to Merge" carry more meaning if they were
>>"Select revisions to Merge from"?
>>
>>
>
>Ok, I have to leave that to the native english speakers here.
>But for my 'feeling' about "merge from": I always ask "from where" if
>I here something like that - and then I get confused when I can't
>answer that immediately.
>
>Stefan
>
>
Better to leave it as you have it then, creating further questions would
be worse.
Something that has been lingering in my mind for a while now is the ease
with which one could accidently re-mearge the same revisions from a
branch if the branch was not deleted immediatly after merging it's diffs
into a trunk.
I hope the log will be automatically be updated with the applied
revision numbers after a commited merge operation. No point in relying
on humans to get it right .
Then, whenever the log is displayed from the Merge dialog, the diffs
which have already been applied are either unselectable or highlighted
in some manner that warns the user.
If it can be got wrong, then eventually I will be got wrong it despite
the user's best efforts.
Regards
Peter McNab
Received on Mon Jan 24 12:15:36 2005