Boost logo

Boost :

Subject: [boost] [git] Problems with Boost.Sync
From: Andrey Semashev (andrey.semashev_at_[hidden])
Date: 2013-12-07 13:11:40


My first experience with git is failing miserably. I was trying to checkout
Boost.Sync, which is not present in the normal checkout as described in the
wiki [1]. It is only present in the develop branch, so I thought I have to do:

  git submodule foreach --recursive git checkout develop

That didn't help, so I also did

  git checkout develop
  git pull

The last command failed with the error:

First, rewinding head to replay your work on top of it...
Applying: Fixed serialization of the wave tool.
Using index info to reconstruct a base tree...
M libs/wave
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule libs/wave (commits don't follow merge-base)
Auto-merging libs/wave
CONFLICT (submodule): Merge conflict in libs/wave
Failed to merge in the changes.
Patch failed at 0001 Fixed serialization of the wave tool.
The copy of the patch that failed is found in:

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

I swear I didn't even touch wave! The mentioned patch is:

diff --git a/libs/wave b/libs/wave
--- a/libs/wave
+++ b/libs/wave
@@ -1 +1 @@
-Subproject commit 55350dd2f9d1ce39aa253c49e9e10f073f776a35
+Subproject commit 96207efc61d549b9a810f067bfefe2bf55c28a65

This looks like a superproject metadata for the submodule, and I have no idea
to what I should apply this patch. I'm at a loss.

1. How can I get rid of this error?
2. How can I checkout Boost.Sync?

Boost list run by bdawes at, gregod at, cpdaniel at, john at