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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
...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 d...@davlevels.com wrote: 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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
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 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 d...@davlevels.com wrote: 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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
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.auwrote: 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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
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, but then again it's not always common for more than one person to be messing with the same function at the same time tbh. Thanks, - Saul. On 25 Aug 2009, at 13:56, 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 Kraeutmannda...@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
Re: [hlcoders] Source control solution?
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 communication between the developers go a long way to preventing merge pains. --Bob On Tue, Aug 25, 2009 at 6:48 AM, Saul Rennisonsaul.renni...@gmail.com wrote: 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, but then again it's not always common for more than one person to be messing with the same function at the same time tbh. Thanks, - Saul. On 25 Aug 2009, at 13:56, 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 Kraeutmannda...@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 ___ To unsubscribe, edit your list preferences, or view the list archives, please visit: http://list.valvesoftware.com/mailman/listinfo/hlcoders
Re: [hlcoders] Source control solution?
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 dev in question goes on holiday for 3 weeks and forgets to commit their code. On Wed, Aug 26, 2009 at 5:24 AM, Bob Somers magicbob...@gmail.com wrote: 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 communication between the developers go a long way to preventing merge pains. --Bob On Tue, Aug 25, 2009 at 6:48 AM, Saul Rennisonsaul.renni...@gmail.com wrote: 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, but then again it's not always common for more than one person to be messing with the same function at the same time tbh. Thanks, - Saul. On 25 Aug 2009, at 13:56, 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
Re: [hlcoders] Erour in OB Mod
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
basecombatcharacter. But HL2MP needs it for the tripmines, and singleplayer
needs it for the barnacles.
If you change the declaration in game\shared\basegrenade_shared.h to this
(it's kind of messy because of the #ifdefs) it'll work.
//Tony; Compromise! in episodic single player, inherit CBaseCombatCharacter
for the barnacle interaction, otherwise this will never get called.
class CBaseGrenade :
#if defined( HL2_EPISODIC ) || defined ( HL2MP )//Tony; HL2MP
needs this too for tripmine grenades.
public CBaseCombatCharacter
#else
public CBaseAnimating
#endif
#if defined( GAME_DLL )
, public CDefaultPlayerPickupVPhysics
#endif
{
DECLARE_CLASS( CBaseGrenade, CBaseAnimating );
public:
-Tony
-Original Message-
From: hlcoders-boun...@list.valvesoftware.com
[mailto:hlcoders-boun...@list.valvesoftware.com] On Behalf Of Jorge Rodriguez
Sent: August-25-09 12:34 AM
To: Discussion of Half-Life Programming
Subject: Re: [hlcoders] Erour in OB Mod
You have a function definition, looking similar to:
void CBaseGrenade::HandleInteraction()
{
// ... blah blah
}
You must have copied a function from CBaseGrenade and tried to add it to
grenade_frag.cpp because the compiler is complaining. The function is
declared as a member of CBaseGrenade when it needs to be CHL2GrenadeFrag or
whatever.
This is a pretty simply C++ syntax problem. If you're getting in over your
head with the (complicated) C++ syntax, I recommend starting with something
simpler than what you're doing, and reading more about how C++ works.
___
To unsubscribe, edit your list preferences, or view the list archives, please
visit:
http://list.valvesoftware.com/mailman/listinfo/hlcoders
