You can also use `bzr diff --old=. --new=lp:~vila/bzr/tarball-generator` to see the diff between your local branch and vila's. qdiff will accept the same options as well.
Another alternative is to use `bzr merge lp:~vila/bzr/tarball-generator` in your local branch and then use diff/qdiff to see the changes, before you commit the merge.
You can also use `bzr diff --old=. --new=lp:~vila/bzr/tarball-generator` to see the diff between your local branch and vila's. qdiff will accept the same options as well.
Another alternative is to use `bzr merge lp:~vila/bzr/tarball-generator` in your local branch and then use diff/qdiff to see the changes, before you commit the merge.