| ROS Resources: Documentation | Support | Discussion Forum | Index | Service Status | ros @ Robotics Stack Exchange |
Hi all!
We are beginning building a stack in ros. And we want to use git as our version control system. But we find a lot of problems with conflicted files created by ROS when we build the packages.
To solve this kind of problems you have done a big .gitignore file ? Or do something to build the project outsite ?
Thanks for all your answers,
Arnau
In our repository, we have a .gitignore file with the following contents:
.cproject
.project
.pydevproject
cmake_install.cmake
build/
bin/
lib/
msg_gen/
srv_gen/
(The first three lines are only relevant if you are using Eclipse.) By placing this file in the top-level directory of the repository, git will ignore all those files/folders even in all subdirectories.
This way, I only need a separate .gitignore file in a package directory to catch some special cases. One not-so-special "special case" is when you have an action definition (e.g., JointMovement in the package katana). In that case, I have the following .gitignore:
msg/JointMovementActionFeedback.msg
msg/JointMovementActionGoal.msg
msg/JointMovementAction.msg
msg/JointMovementActionResult.msg
msg/JointMovementFeedback.msg
msg/JointMovementGoal.msg
msg/JointMovementResult.msg
src/katana/
msg/lisp/
Unfortunately, I have not found a decent way yet to include these patterns into the global .gitignore.
Yes, that works. Or borrowing from @"felix k"'s answer, you can also put `*/msg/*Action.msg` etc. into the parent directory. Just tried it [here](https://github.com/uos/katana_driver/commit/838af6197ea20ee16e90b815753a6058dcba0b6a). NB: you can put line breaks into comments using shift-enter. :-)
Ooops. Seems like all the fancy markdown (and shift-enter trick) doesn't work any more in comments. My bad.
We are using gut for most of our stacks. A common gitignore file contains the following entries:
build
bin
lib
msg_gen
srv_gen
You might also want to add generated python files that are placed in src/<your_package> for each package.
I like Martins list and would like to add hidden backups and compiled python files, as I put pythons in src/ rather than bin/ most times.
*~ *.pyc
To ignore headers generated into <package>/src/<package>/.../ you can either put this in the package's .gitignore:
src/*/cfg src/*/msg src/*/srv
or this in the parent folder's .gitignore:
*/src/*/cfg */src/*/msg */src/*/srv
Note that one level of stars denotes the parent folder, independent of that one being your repo base or metapackage folder.
This does not yet ignore <package>/src/<package>/__init__.py, for which I suggest an specific entry in each package where needed.
A good rule of thumb is to do a make clean on your package before you check it in. Anything leftover after make clean is usually safe to include in a git repo.
To hide the files generated by dynamic reconfigure we also have this lines in our .gitignore:
*.cfgc
__init__.py
src/*/cfg
cfg/cpp
All good additions, but the __init__.py is a little too general (you do want to check in some files with that name, only not those generated by dynamic reconfigure).
The cfg/cpp entry doesn't work for me. I've started a StackOverflow question about it: http://stackoverflow.com/questions/25...
What do you mean by conflicted files. I'm not using git, but if you are referrring to unversioned files, there should not be many. Usually it is the build/ directory that should be ignored, maybe also lib/ and bin/. Maybe you commited the build/ directory and are now getting a lot of conflicts there. You can leave that out of the repository.
Asked: 2011-06-06 22:11:49 -0500
Seen: 6,699 times
Last updated: Jul 09 '13
ROS Answers is licensed under Creative Commons Attribution 3.0 Content on this site is licensed under a Creative Commons Attribution Share Alike 3.0 license.
Good question !