[Git-dpm-user] git-dpm: ERROR: 'patched' does not contain 'upstream'!

[Bernhard R. Link]

* Paul Elliott <pelliott at blackpatchpanel.com> [130819 13:12]:
> I was doing a git-dpm update-patches, and I got the error:
> 
> git-dpm: ERROR: 'patched' does not contain 'upstream'!
> 
> What does this error mean, and how do I fix it?

That's supposed to mean that your branch 'patched' is not
based on your current branch 'upstream', as it is expected at
this point.

Either you have a stale upstream branch (deleting it or
running git-dpm prepare should avoid that), or the patched
branch does not contain the upstream branch (perhaps you
forgot a git-dpm rebase-patched after recording a new upstream
version?).
Or patched or upstream were otherwise modified that they no longer
match.

        Bernhard R. Link