Forum Home
Press F1
 
Thread ID: 117764 2011-05-04 04:27:00 c#.net code changes Mike (15) Press F1
Post ID Timestamp Content User
1199230 2011-05-04 04:27:00 I suspect I know the answer, and it probably won't be what I want :) but I'll ask anyway...

I've downloaded some software at work (an add-on/extension to my work software), and modified the source code so that it works with my data. Now every time there is an update to the downloaded software I have to go through it carefully and re-add my changes, and then test that they still work, and if anything else has been changed/added that also needs an update.

Is there a way to somehow keep track of my changes, or a comparison to the new source code, and somehow re-add my changes into the new source code?

The more I think about it, the less likely it seems that there would be anything :)

Is there anything else that would help me easily make my changes to new/updated source code?

I'm running Visual Studio 2010

Cheers,
Mike.
Mike (15)
1199231 2011-05-04 04:35:00 What software is it? bot (15449)
1199232 2011-05-04 04:48:00 Is there a way to somehow keep track of my changes, or a comparison to the new source code, and somehow re-add my changes into the new source code?Yes - use a proper source control system; this kind of thing is exactly what they're for :p.

I personally recommend Git (en.wikipedia.org(software)) for this, but there are several other options too.
Erayd (23)
1199233 2011-05-04 05:29:00 Yes - use a proper source control system; this kind of thing is exactly what they're for :p.

I personally recommend Git (en.wikipedia.org) for this, but there are several other options too.Will source control work for downloaded code? ie not my code

Mike
Mike (15)
1199234 2011-05-04 05:38:00 If your changes are the same with each version, you could just create a patch (a diff of your version with your changes vs the original)

Each time the new version comes out, just do something like
patch -p1 < (your changes)
utopian201 (6245)
1199235 2011-05-04 06:17:00 Will source control work for downloaded code? ie not my code

MikeYep, you can put any code you want in it. The reason I suggested Git for this is because of its excellent branching support - it makes working with patches to an external codebase much easier (and faster) than with something like Subversion.

Utopian's suggestion of simply applying a diff via the patch utility will work provided there aren't any updates to the codebase that break context - in the event that this happens, proper source control is generally much more useful for merging the changes back in, whereas patch will simply report an error and give up.
Erayd (23)
1199236 2011-05-04 06:22:00 Yep, you can put any code you want in it. The reason I suggested Git for this is because of its excellent branching support - it makes working with patches to an external codebase much easier (and faster) than with something like Subversion.

Utopian's suggestion of simply applying a diff via the patch utility will work provided there aren't any updates to the codebase that break context - in the event that this happens, proper source control is generally much more useful for merging the changes back in, whereas patch will simply report an error and give up.
OK thanks I'll give that a go and see if I can figure it out. I'm not much of a programmer (well not at all) - usually just butcher stuff to make it work. So hopefully I can figure it out.

Does the Microsoft safe source (or whatever its called) do the same thing, do you know? I've had a request in at work to get this set up for me.

Thanks,
Mike.
Mike (15)
1199237 2011-05-04 06:49:00 Does the Microsoft safe source (or whatever its called) do the same thing, do you know? I've had a request in at work to get this set up for me.SourceSafe *should* be able to achieve the same result, but it's likely to be a lot more painful. The last stable release was in 2005, and there have been many significant improvements in the area of source control systems since then.

This (en.wikipedia.org) is also noteworthy - if even Microsoft avoids it, then I suspect it's not much good.

Note that I haven't used SourceSafe myself.
Erayd (23)
1199238 2011-05-04 07:26:00 it might not be SourceSafe then... is there another Microsoft one? I'm pretty sure the IT guys said it was something MS, but can't remember.

Any chance I could get a 2 minute rundown on how to use Git?

Cheers,
Mike.
Mike (15)
1199239 2011-05-04 07:40:00 just found a site called progit.org, so will take a look at that.

cheers,
Mike.
Mike (15)
1 2