Why isn't it working?
-
-
@MiffTheFox said:
@Ben L. said:
Why don't you just commit locally and then push everything once you're done with it?
1) He's probably not using DCVS.
2) Because down that road lies madness. If I ever had to use Git again I'd use a series of scripts that automatically do pull-commit-push for me.
I'm just a cave fox. I fell on some ice and later got thawed out by your scientists. Your world frightens and confuses me! Sometimes the honking horns of your traffic make me want to get out of my BMW.. and run off into the hills, or wherever.. Sometimes when I try to add a commit message on my DVCS, I wonder: "Did little demons get inside and type it?" I don't know! My primitive mind can't grasp these concepts.CPHFTFY
-
@dhromed said:
@boomzilla said:
UNLESS YOU'RE READING OUR MINDS
gasp how did you know?
did you... INFER?
Nah, I just totally made that shit up. Wait...
-
@boomzilla said:
[quote user="MiffTheFox"][quote user="Ben L."]Why don't you just commit locally and then push everything once you're done with it?
1) He's probably not using DCVS.
2) Because down that road lies madness. If I ever had to use Git again I'd use a series of scripts that automatically do pull-commit-push for me.
I'm just a cave fox. I fell on some ice and later got thawed out by your scientists. Your world frightens and confuses me! Sometimes the honking horns of your traffic make me want to get out of my BMW.. and run off into the hills, or wherever.. Sometimes when I try to add a commit message on my DVCS, I wonder: "Did little demons get inside and type it?" I don't know! My primitive mind can't grasp these concepts. [/quote]CPHFTFY[/quote]
To be honest that's not far from the truth with exaggeration. I desperately want out of the IT industry. This was the only job that took me.
-
@MiffTheFox said:
TortoiseSVN is pretty good. I use VisualSVN too for Visual Studio.
Yeah, and TFS is excellent if you're using Visual Studio (although I wager it's crummy if you aren't.)
-
@MiffTheFox said:
TortoiseSVN is pretty good.
I love having to tell TortoiseSVN on a daily basis what files I created on purpose by picking them from a huge ass list of non-versioned files that includes those whose extension I specifically asked to ignore. I also love the fact that the ignore list is ignored when I run an update so I'm sure to get all the shit I don't want that other people committed.
-
-
@Ronald said:
Read the doc and be delighted. Basically shelving means using the version control system without keeping track of versions...
It's like a shared folder on the network, except that the version control system layer prevents people from using filesystem or file server history features, such as snapshots... And of course a client compatible with the version control system is needed to access the files.
If you can't think of a single benefit of shelves, it's because there are none. Best case scenario it's a way to work around file sharing restrictions on the network.The whole point of shelving is so that if you have a bunch of changes on a branch that aren't finished but are re-prioritised to work on another task that should be on that same branch, you can do shelve it and just undo bringing your code back to the latest code that is checked in. When you unshelve it later it merges you changes back in properly.
It also pretty good for handing off a task to another developer, you can shelve your changes, they unshelves them and carry on where you left off.
I really don't see what is so terrible about it.
-
@lucas said:
The whole point of shelving is so that if you have a bunch of changes on a branch for a check-in that aren't finished but are re-prioritised to work on another task that should be on that same branch, you can do shelve it and just undo bringing your code back to the latest check-in code. When you unshelve it later it merges you changes back in properly.
You shouldn't ever have to do this, though. You should just be able to create a new branch for the other task.
@lucas said:
I really don't see what is so terrible about it.
Well, it loses the history, for one. Also, what if someone decides that the feature you were originally working on should now be completed by someone else? How do they unshelve without fucking up the branch you're working on? If you used proper branches, this wouldn't happen.
-
@morbiuswilters said:
You shouldn't ever have to do this, though. You should just be able to create a new branch for the other task.
I am talking about a related task to the first. Yes we do make new branches for new features. e.g. Recently I was working on a bunch of changes for the flash games launcher (complete and utter overhaul), one of the lower priority changes was deemed "it must be finished by the end of the week" and it was a minor change in a JavaScript function. It was still related to the same set of tasks (overhauling the flash games launcher).So I shelved all the changes that I had done so far, put the code back to what was it was on the last check-in, made my change and checked it in. So if someone does a "get latest" they get a sane working copy of that particular branch.
@lucas said:
Well, it loses the history, for one. Also, what if someone decides that the feature you were originally working on should now be completed by someone else? How do they unshelve without fucking up the branch you're working on? If you used proper branches, this wouldn't happen.
I think you are mis-understanding how this works, nothing get a changeset number in TFS until check-in. When you do a shelve the changes have a name, a description and who shelved them and they live somewhere in the TFS server. When you unshelve the changes only get picked up in your local solution. At no point are the changes related to any branch in particular and branches don't change unless you do a check-in.
-
@boomzilla said:
@MiffTheFox said:
Now if I could just figure out why your sig is talking about "cool woodpeckers medicine"....I'm just a cave fox. I fell on some ice and later got thawed out by your scientists. Your world frightens and confuses me! Sometimes the honking horns of your traffic make me want to get out of my BMW.. and run off into the hills, or wherever.. Sometimes when I try to add a commit message on my DVCS, I wonder: "Did little demons get inside and type it?" I don't know! My primitive mind can't grasp these concepts.
CPHFTFY
-
@da Doctah said:
Now if I could just figure out why your sig is talking about "cool woodpeckers medicine"....
It's what Google Translate thinks this means: “Good Morning, I’m sorry there’s no trade secrets or Canadian porn in this e-mail. Please stop killing cool animals for pecker medicine. Just buy some Viagra already.”
