Indeed, it sounds like you know how to merge so what's the problem? On 25/08/2009, at 10:56 PM, "Arg!" <chillic...@gmail.com> 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, Aug 25, 2009 at 9:44 PM, Andrew Armstrong <and...@mammoth.com.au > >wrote: > >> 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: Discussion of Half-Life Programming >> Subject: Re: [hlcoders] Source control solution? >> >> 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 but i don't like the merge thing. >> >> I just have to keep remembering that that VSS 'Get latest version' >> is SVN >> 'Checkout' and VSS 'Check Out' is SVN 'Lock On'. ;) >> (and other similar things) >> >> Thanks again, >> 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 12:12 AM, Arg! <chillic...@gmail.com> wrote: >> >>> I had some trouble moving from locking based SourceSafe to SVN as >>> well, >> but >>> once someone sat down and explained it to me, it actually makes a >>> lot >> more >>> sense. If its just 1 person or a team, SVN works brilliantly. >>> It does require a different way of thinking from the SourceSafe >>> camp but >> if >>> you constantly compare the two you wont be able to see the benefits. >>> >>> On Tue, Aug 25, 2009 at 8:16 AM, David Kraeutmann >>> <da...@davidkra.net >>>> wrote: >>> >>>> Cygwin's/linux QT based gui. Forgot how it's called. >>>> >>>> On 8/24/09, Stephen Micheals <stephen.miche...@gmail.com> wrote: >>>>> What other gui's are available for git on windows, i have not been >>>>> able to find any that were even up to par with Tortoisegit. >>>>> >>>>> On Mon, Aug 24, 2009 at 2:31 PM, David Kraeutmann<da...@davidkra.net >>> >>>>> wrote: >>>>>> TortoiseGIT was the worst git GUI I ever encountered. >>>>>> Also, if anyone needs SVN/git/whatever hosting, write me (it'll >>>>>> be >>>>>> most probably free ;) ) >>>>> >>>>> _______________________________________________ >>>>> To unsubscribe, edit your list preferences, or view the list >> archives, >>>>> please visit: >>>>> http://list.valvesoftware.com/mailman/listinfo/hlcoders >>>>> >>>>> >>>> >>>> -- >>>> Sent from my mobile device >>>> >>>> _______________________________________________ >>>> To unsubscribe, edit your list preferences, or view the list >>>> archives, >>>> please visit: >>>> http://list.valvesoftware.com/mailman/listinfo/hlcoders >>>> >>>> >>> _______________________________________________ >>> To unsubscribe, edit your list preferences, or view the list >>> archives, >>> please visit: >>> http://list.valvesoftware.com/mailman/listinfo/hlcoders >>> >>> >>> >> _______________________________________________ >> To unsubscribe, edit your list preferences, or view the list >> archives, >> please visit: >> http://list.valvesoftware.com/mailman/listinfo/hlcoders >> >> >> >> _______________________________________________ >> To unsubscribe, edit your list preferences, or view the list >> archives, >> please visit: >> http://list.valvesoftware.com/mailman/listinfo/hlcoders >> >> > _______________________________________________ > To unsubscribe, edit your list preferences, or view the list > archives, please visit: > http://list.valvesoftware.com/mailman/listinfo/hlcoders > _______________________________________________ To unsubscribe, edit your list preferences, or view the list archives, please visit: http://list.valvesoftware.com/mailman/listinfo/hlcoders
