« Return to Thread: Re: Digest Number 1183

RE: Digest Number 1183

by Andrew Scott-9 :: Rate this Message:

Reply to Author | View in Thread

In a team environment if a member of my team changes the file I am working on, I then will have a conflict. Now I would need to show the changes or compare my working copy with SVN to see if the changes in that file impact on what I am working on.

And then make the necessary decision on what is needed to be merged, in either direction.

Especially if those changes then make my code redundant I need to see at a quick snap whether I am wasting my time fixing something that, could have been completely changed or even fixed by another developer.



From: smartsvn@... [mailto:smartsvn@...] On Behalf Of Jason Hughes
Sent: Friday, 26 June 2009 2:59 PM
To: smartsvn@...
Subject: Re: [smartsvn] Digest Number 1183

Andrew makes some good points about having server-related operations on
a separate menu from local-related operations. Perforce does a good job
of collecting Client, Task, Changelist, etc operations into separate
menus. This is handy, even if it makes some of the menus longer.

However, I have never found any reason to check my changes against the
HEAD. As long as there's a standard diff vs. local, and a diff vs.
revision/HEAD, I'm satisfied. If you want to add a smart diff that
checks local, then remote, then specific revisions, fine... but make
that a completely different command, because it would infuriate me to
see other people's changes when I'm trying to decide what my check-in
comment should be, and whether I want to check in a file at all.

I can't remember if SmartSVN comes this way or if I configured it, I
have double-click mapped to Diff. It's way faster than using a context
menu, and is generally the most-used operation (for me at least).

JH

--
Jason Hughes
President
Steel Penny Games, Inc.
Austin, TX
__._,_._


[Non-text portions of this message have been removed]



------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartsvn/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartsvn/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:smartsvn-digest@...
    mailto:smartsvn-fullfeatured@...

<*> To unsubscribe from this group, send an email to:
    smartsvn-unsubscribe@...

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/

 « Return to Thread: Re: Digest Number 1183