Firmware management in version control

Question

I am currently using subversion to manage my source code, and I have come to the point where I need to create the software that I am working on for the client. All branding is processed in the project resources, so changing the way you look at the client is very simple. I had a problem saving the proprietary version of the software in the original repository. This is a separate branch right now, but when you try to merge the changes from the trunk to the branded branch, it happily overwrites the file with the branded resource.

What would be a good way to preserve these differences, but still you could easily check everything you need to create a release for a trunk assembly or an assembly using a custom resource file?

Answer 1

You can make a branded retailer a separate repo using the vanilla branch as an external one.

An alternative would be to keep everything in one branch and complete the build process to choose which files to use for branding.

Answer 2

You need to keep branding as a wrapper around the core technology, as every other project that I know does this.

However, if you did not think of a project like this from the very beginning, you may need a week or two to reorganize everything.

, , . , -, , , - .

Answer 3

( ). , "".

Answer 4

, , , (-) (-)? , .

, . , (: "" ) . Eclipse , / /.

:.

:
////
////
////
////d/E/F/

:
/////
/////
/////

/ IOS / project / branch /
source / a
/ IOS / project / branch / source / b
/ I / project / branch / source / s