problems updating my source code

[mafeluna]

Hi all,

a while ago I made some changes to the ROMS code and it compiled and run without problems. Then I tried to update the ROMS version with 'svn update'. When I did this, the files that I modified were not updated and none conflict was reported. As a result of this the code is not compiling. According with wikiroms (https://www.myroms.org/wiki/index.php/Subversion), svn should report conflicts and give me the option to merge them by hand.

How can I update my code while keeping my changes?

Thanks in advance.

Maria

[arango]

You need to resolve the conflicts. There are many ways how to do that. I usually compare the affected files, said *.F and *.F.mine using any difference tool. I regularly use xemacs compare two files option and resolve the issues.

Check the wiki for more information about conflicts.

[m.hadfield]

Are you keeping your modifications in a working copy? This is not a good idea as they can be wiped out at any time, specifically when files in the repository are moved. You really want your modifications to be under version control, separate from the master source. One way of doing this was discussed by Kate Hedstrom here

https://www.myroms.org/blog/?p=166

with a recent follow-up here

https://www.myroms.org/blog/?p=168

There are other ways.