traceback and failure due to tag merge conflict

[tfoote]

It seems that several jobs failed due to merge conflicts. This should be caught and handled. I believe we discussed that if the tags had a conflict to just ignore it and they'll be added later upstream. We might want to revisit this as we seem to have a lot of conflicts as we have a lot of doc jobs running simultaneously. (note they do seem to be running much faster with the new use of rsync. possibly 3x)

For example http://jenkins.willowgarage.com:8080/view/Fdoc/job/doc-fuerte-srs_public/15/consoleText:

Executing command 'bash -c rsync -e "ssh -o StrictHostKeyChecking=no" -qr /home/rosbuild/hudson/workspace/doc-fuerte-srs_public/doc_stacks/2012-12-23_14-08-28.464095/doc/fuerte rosbuild@wgs32:/var/www/www.ros.org/html/rosdoclite'

Executing command 'git add /home/rosbuild/hudson/workspace/doc-fuerte-srs_public/rosdoc_tag_index/fuerte'

Commiting changes to tags and deps lists....
Executing command 'git commit -a -m Updating tags and deps lists for fuerte'
[master e29f64d] Updating tags and deps lists for fuerte
 Committer: root <root@host84.storm.willowgarage.com>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

    git commit --amend --reset-author

 35 files changed, 201 insertions(+), 183 deletions(-)
 rewrite fuerte/metapackages/srs_public (100%)
 rewrite fuerte/tags/libassimp-dev (95%)
 rewrite fuerte/tags/libeigen3-dev (98%)
 rewrite fuerte/tags/ros-fuerte-actionlib (97%)
 rewrite fuerte/tags/ros-fuerte-bfl (100%)
 rewrite fuerte/tags/ros-fuerte-bond-core (78%)
 rewrite fuerte/tags/ros-fuerte-bullet (98%)
 rewrite fuerte/tags/ros-fuerte-cob-calibration-data (72%)
 rewrite fuerte/tags/ros-fuerte-cob-extern (100%)
 rewrite fuerte/tags/ros-fuerte-cob-substitute (100%)
 rewrite fuerte/tags/ros-fuerte-common-msgs (74%)
 rewrite fuerte/tags/ros-fuerte-common-rosdeps (96%)
 rewrite fuerte/tags/ros-fuerte-control (88%)
 rewrite fuerte/tags/ros-fuerte-diagnostics (86%)
 rewrite fuerte/tags/ros-fuerte-driver-common (92%)
 rewrite fuerte/tags/ros-fuerte-executive-smach-visualization (100%)
 rewrite fuerte/tags/ros-fuerte-genlisp (97%)
 rewrite fuerte/tags/ros-fuerte-geometry-experimental (95%)
 rewrite fuerte/tags/ros-fuerte-geometry-visualization (73%)
 rewrite fuerte/tags/ros-fuerte-image-common (85%)
 rewrite fuerte/tags/ros-fuerte-openni-camera (85%)
 rewrite fuerte/tags/ros-fuerte-openni-kinect (64%)
 rewrite fuerte/tags/ros-fuerte-pr2-common (64%)
 rewrite fuerte/tags/ros-fuerte-pr2-gui (100%)
 rewrite fuerte/tags/ros-fuerte-prosilica-driver (86%)
 rewrite fuerte/tags/ros-fuerte-python-qt-binding (73%)
 rewrite fuerte/tags/ros-fuerte-ros (67%)
 rewrite fuerte/tags/ros-fuerte-ros-comm (63%)
 rewrite fuerte/tags/ros-fuerte-rospack (90%)

Executing command 'git fetch origin'

Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.
From github.com:ros-infrastructure/rosdoc_tag_index
   121490f..c9f5c43  master     -> origin/master

Executing command 'git merge origin/master'
Auto-merging fuerte/tags/ros-fuerte-rospack
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-rospack
Auto-merging fuerte/tags/ros-fuerte-ros-comm
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-ros-comm
Auto-merging fuerte/tags/ros-fuerte-ros
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-ros
Auto-merging fuerte/tags/ros-fuerte-openni-kinect
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-openni-kinect
Auto-merging fuerte/tags/ros-fuerte-openni-camera
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-openni-camera
Auto-merging fuerte/tags/ros-fuerte-image-common
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-image-common
Auto-merging fuerte/tags/ros-fuerte-genlisp
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-genlisp
Auto-merging fuerte/tags/ros-fuerte-driver-common
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-driver-common
Auto-merging fuerte/tags/ros-fuerte-diagnostics
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-diagnostics
Auto-merging fuerte/tags/ros-fuerte-common-rosdeps
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-common-rosdeps
Auto-merging fuerte/tags/ros-fuerte-common-msgs
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-common-msgs
Auto-merging fuerte/tags/ros-fuerte-bullet
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-bullet
Auto-merging fuerte/tags/ros-fuerte-bond-core
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-bond-core
Auto-merging fuerte/tags/ros-fuerte-actionlib
CONFLICT (content): Merge conflict in fuerte/tags/ros-fuerte-actionlib
Auto-merging fuerte/tags/libeigen3-dev
CONFLICT (content): Merge conflict in fuerte/tags/libeigen3-dev
Auto-merging fuerte/tags/libassimp-dev
CONFLICT (content): Merge conflict in fuerte/tags/libassimp-dev
Automatic merge failed; fix conflicts and then commit the result.

/!\  Failed to execute command '['git', 'merge', 'origin/master']'
Failed to fetch and merge...
Trying again attempt 1 of 3...
Executing command 'git fetch origin'

Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.

Executing command 'git merge origin/master'

error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.

/!\  Failed to execute command '['git', 'merge', 'origin/master']'
Failed to fetch and merge...
Trying again attempt 2 of 3...
Executing command 'git fetch origin'

Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.

Executing command 'git merge origin/master'

error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.

/!\  Failed to execute command '['git', 'merge', 'origin/master']'
Failed to fetch and merge...
Trying again attempt 3 of 3...
Executing command 'git fetch origin'

Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts.

Executing command 'git merge origin/master'

error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.

/!\  Failed to execute command '['git', 'merge', 'origin/master']'
Failed to fetch and merge...
Traceback (most recent call last):
  File "/home/rosbuild/hudson/workspace/doc-fuerte-srs_public/jenkins_scripts/doc", line 158, in <module>
    main()
  File "/home/rosbuild/hudson/workspace/doc-fuerte-srs_public/jenkins_scripts/doc", line 155, in main
    homepage, rosdoc_lite_version, jenkins_scripts_version)
  File "/home/rosbuild/hudson/workspace/doc-fuerte-srs_public/jenkins_scripts/doc_stack.py", line 298, in document_repo
    tags_db.commit_db(excludes)
  File "/home/rosbuild/hudson/workspace/doc-fuerte-srs_public/jenkins_scripts/tags_db.py", line 203, in commit_db
    raise e
common.BuildException

[eitanme]

These conflicts are actually happening because I have a bug in my code. I solved the merge conflict problem by splitting the database into separate files... so it really shouldn't happen very often. I think I know what's up will look into a fix now.

[eitanme]

I think that this should be fixed as of https://github.com/ros-infrastructure/jenkins_scripts/commit/0b55ab91b77904c5d22c7ee716cb2ea184713125 but I'll wait to close until we see the jobs passing again.

[eitanme]

Doc jobs don't seem to be failing because of merge conflicts any more. I'm going to close this ticket.