Thanks for all the replies. It really helped.
I decided to give the svn/xp-dev.com/tortoiseSVN another try.
And after some work i managed to get used to it.
I managed to make the lock of all the files mandatory and also add some
other things more at my taste.
I know the lock doesn't have to be bu
...VSS 'Get latest version' is SVN 'Update' :S
Davide (DAV)
Email: d...@davlevels.com
Azure Sheep: http://mods.davlevels.com/azuresheep/
Point of View: http://mods.davlevels.com/pointofview/
DAV Levels: http://www.davlevels.com/
On Tue, Aug 25, 2009 at 9:11 AM, DAV wrote:
> Thanks for all th
Merging really isn't all that scary once you've done it a few times, and
as long as you keep you change sets small and to the point, it shouldn't
pose you any problems.
Of course that only really matters if you're working with someone else
at the same time.
Rich
DAV wrote:
> ...VSS 'Get lates
File locking sucks, learn to use merge. Heck, SVN takes care of it for you
the majority of the time!
- Andrew
-Original Message-
From: hlcoders-boun...@list.valvesoftware.com
[mailto:hlcoders-boun...@list.valvesoftware.com] On Behalf Of DAV
Sent: Tuesday, 25 August 2009 6:11 PM
To: Discus
to take full advantage of SVN you really need to switch out of the file
locking mentality.
it seems counter-intuitive at first but after a while its pure magic.
On Tue, Aug 25, 2009 at 9:44 PM, Andrew Armstrong wrote:
> File locking sucks, learn to use merge. Heck, SVN takes care of it for you
>
Indeed, it sounds like you know how to merge so what's the problem?
On 25/08/2009, at 10:56 PM, "Arg!" wrote:
> to take full advantage of SVN you really need to switch out of the
> file
> locking mentality.
>
> it seems counter-intuitive at first but after a while its pure magic.
>
> On Tue, A
There's only been one case of merge screwing up on me. I say screwed
up but I really mean it should have come up as "Conflicted" instead of
trying to be too clever and merging in code which I just removed.
I've never locked any file and my team haven't needed too either.
Merge works fine, bu
Merges from hell generally occur when someone has been working for
weeks without committing their code. That's when you run into problems
because they (or someone else) has touched everywhere in the code base
and a ton of things need to be merged. Updating/committing often and
some simple communica
When svn was explained to me, i was told that 1 thing svn doesnt do is
manage the project for you. Team members still need to be know who's working
in what area to avoid conflicts. The file locking method prevents devs from
stuffing up someone else's work in progress, but that doesnt help when the
Thanks for all the help Tony, it is now working fine and i will try to
put in the graple hook once i have made some changes
Vbitz
Tony Sergi wrote:
> No it was my fault. In basegrenade_shared.h I was making changes purely for
> the SDK because I didn't want the scratch SDK to have grenades as
>
10 matches
Mail list logo
