CODEWITHSUNDEEP
cmergelabwindowscvi
TriceratopsMagician
TriceratopsMagician

Reputation: 13

Merge code from several folders

Good Morning,

I am working on legacy code. This legacy code consists of multiple projects (language C with NI LabWindows CVI) and was never manged in a source control System but only in on folders. Over time it got a little messy and copies of this folder were created and changes were made to all folders depending the project that was built. The result is, that there are 5 folders each containing different codes bases for what once was the same code. Also many files were modified in all folders because they are used in several projects. Each project was only build from 1 of the 5 folder (so project A was only build in folder 1, project b in Folder 4 etc.). It is not only raw code, but also user interface files.

I hope that was clear so far.

My task is to merge all the code into one one codes base (as it started of originally). And I would like to get some suggestions.

Here is the plan: 1. create baseline version of one folder that is supposedly that one with the most changes. 2. create GIT repository to store the code and all changes 3. go through all folders and merge files into baseline version using file diff software. (Folder 1 is baseline, merge folder 2 to baseline, merge folder 3 to baseline etc.)

Do you have any comments on this plan? What is good? Bad? Are there tools I can use?

Upvotes: 0

Views: 172

Answers (2)

rak0ribz
rak0ribz

Reputation: 1

It might also be worthwhile to use the UI to Code converter under CVI's Tools menu to convert all your UIRs to code. This should make them more compatible with text-based source control (like the save in text format approach), but may also ease the process of merging UIs.

Upvotes: 0

jkuz
jkuz

Reputation: 131

This seems like as good of a plan as any. You have a mess on your hands either way.

If there are many changes to the user interface panels, that could be a headache. The UIR files are binaries, which will make git merges and diffs useless.

Go into each project and under Options->Preferences select the box to save .UIR files as .TUI files and save the project. This will give you a text file output describing the user interface and allow you to use diff tools properly.

EDIT

When the User Interface is active, you can directly select Options->Save in Text Format to do this as a one-off.

Good Luck!

Upvotes: 2

Related Questions