Permalink
Browse files

build: changed .gitattributes so project settings files will no longe…

…r cause merge conflicts.

   Specific setting files added to .gitignore so local changes will not be included in the commit by default
   Changes from the repo will not overwrite the local copy because "ours" merging strategy is specified

To commit any changes into these files you have to use 'git add -f filename'
Depending on your git version you may need to enable the 'ours' merge driver for the project:

$ git config merge.ours.driver true

To avoid adding back your local config file changes to the repo, execute the
_scripts/track-config-files-off command. This will prevent git to check for file changes.
Use _scripts/track-config-files-on to enable hange tracking.
  • Loading branch information...
1 parent 1cf2059 commit d4617b23d9e1e7aa4c4a98bb13db6efb06133bc7 @rhornig rhornig committed with avarga Aug 22, 2013
Showing with 26 additions and 14 deletions.
  1. +11 −13 .cproject-DEFAULT → .cproject
  2. +4 −0 .gitattributes
  3. +1 −1 .gitignore
  4. +5 −0 _scripts/track-config-files-off
  5. +5 −0 _scripts/track-config-files-on
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="org.omnetpp.cdt.gnu.config.debug.1590007136">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.omnetpp.cdt.gnu.config.debug.1590007136" moduleId="org.eclipse.cdt.core.settings" name="gcc-debug">
@@ -22,7 +20,7 @@
<folderInfo id="org.omnetpp.cdt.gnu.config.debug.1590007136." name="/" resourcePath="">
<toolChain id="org.omnetpp.cdt.gnu.toolchain.debug.561565264" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.debug">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.442367031" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
- <builder id="org.omnetpp.cdt.gnu.builder.debug.1373225503" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.debug">
+ <builder id="org.omnetpp.cdt.gnu.builder.debug.1373225503" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNEST Make Builder (opp_makemake)" parallelBuildOn="false" superClass="org.omnetpp.cdt.gnu.builder.debug">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
@@ -35,7 +33,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -48,6 +45,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.529631020" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
@@ -57,7 +55,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -70,6 +67,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.541669033" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
@@ -95,7 +93,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -108,6 +105,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.164668854" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
@@ -117,7 +115,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -130,6 +127,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1205441703" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
@@ -166,15 +164,14 @@
<folderInfo id="org.omnetpp.cdt.gnu.config.release.960890479." name="/" resourcePath="">
<toolChain id="org.omnetpp.cdt.gnu.toolchain.release.1853525977" name="GCC for OMNeT++" superClass="org.omnetpp.cdt.gnu.toolchain.release">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.MachO64;org.eclipse.cdt.core.PE" id="org.omnetpp.cdt.targetPlatform.8638873" isAbstract="false" name="Windows, Linux, Mac" osList="win32,linux,macosx" superClass="org.omnetpp.cdt.targetPlatform"/>
- <builder id="org.omnetpp.cdt.gnu.builder.release.2101319956" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNeT++ Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
+ <builder id="org.omnetpp.cdt.gnu.builder.release.2101319956" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="OMNEST Make Builder (opp_makemake)" superClass="org.omnetpp.cdt.gnu.builder.release"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.879724210" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.209048065" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<option id="gnu.cpp.compiler.option.preprocessor.def.261743951" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="WITH_TCP_COMMON"/>
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -187,6 +184,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1288707802" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
@@ -196,7 +194,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -209,6 +206,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1382867862" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
@@ -234,7 +232,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -247,6 +244,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.803078146" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
@@ -256,7 +254,6 @@
<listOptionValue builtIn="false" value="WITH_TCP_INET"/>
<listOptionValue builtIn="false" value="WITH_IPv4"/>
<listOptionValue builtIn="false" value="WITH_IPv6"/>
- <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
<listOptionValue builtIn="false" value="WITH_UDP"/>
<listOptionValue builtIn="false" value="WITH_RTP"/>
<listOptionValue builtIn="false" value="WITH_SCTP"/>
@@ -269,6 +266,7 @@
<listOptionValue builtIn="false" value="WITH_BGPv4"/>
<listOptionValue builtIn="false" value="WITH_TRACI"/>
<listOptionValue builtIn="false" value="WITH_MANET"/>
+ <listOptionValue builtIn="false" value="WITH_xMIPv6"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1633345790" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
View
@@ -0,0 +1,4 @@
+.cproject merge=ours
+.nedfolders merge=ours
+.oppbuildspec merge=ours
+.project merge=ours
View
@@ -1,5 +1,5 @@
# ignore generated files
-.cmdenv-log
+.settings/
*_m.h
*_m.cc
*_sm.h
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd `dirname $0`/.. || { echo --- error changing to the inet root directory ---; exit 1;}
+
+git update-index --assume-unchanged .cproject .nedfolders .oppbuildspec .project
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd `dirname $0`/.. || { echo --- error changing to the inet root directory ---; exit 1;}
+
+git update-index --no-assume-unchanged .cproject .nedfolders .oppbuildspec .project

0 comments on commit d4617b2

Please sign in to comment.