Hi,
$ bzr branch devel merge $ bzr branch lp:~adiroiban/launchpad/bug-359180/ merge-1 $ cd merge $ bzr merge ../merge-1/ Nothing to do.
The original branch is part of devel... just that a new commit is reverting those changes. There was no "hard rebase" to revert the branch.
I can not get a clean diff.
Is there an option for a filter to diff to only show lines changed be me?
Maybe it will be easier to have a new full review.
« Back to merge proposal
Hi,
$ bzr branch devel merge
$ bzr branch lp:~adiroiban/launchpad/bug-359180/ merge-1
$ cd merge
$ bzr merge ../merge-1/
Nothing to do.
The original branch is part of devel... just that a new commit is reverting those changes. There was no "hard rebase" to revert the branch.
I can not get a clean diff.
Is there an option for a filter to diff to only show lines changed be me?
Maybe it will be easier to have a new full review.