vcstools/vcstools — pull request #15 by dirk-thomas (2012-10-19 21:01:12+00:00)
Title: git._do_fast_forward erroneous returns true when in diverged state (and fast-forward is not performed)

The hack fixes git._do_fast_forward to return false when in diverged state (and fast-forward is not performed). But since this modification breaks several unit tests I wanted you to look over the code and suggest a better/cleaner way to do it.