rev to upstream, hack some stuff, forget to commit, end up with changes
like this