Stefano, Naty:
I don't know much about packages, so to don't get lost I sticked to the basics in the following procedure. See, I branched both "Proposed branch" and "Merge into" branches from this MP, and checked *one* file:
$ cd /tmp $ mkdir magicicada $ bzr branch lp:~facundo/ubuntu/maverick/magicicada/0.2-update Branched 6 revision(s). $ bzr branch lp:ubuntu/magicicada current-magicicada Branched 4 revision(s). $ cd current-magicicada/ $ diff COPYING ../0.2-update/COPYING $
The COPYING file is the same!
So, I don't understand Stefano why you're finding differences for it, or why Launchpad is showing differences in the "Preview Diff" here below.
« Back to merge proposal
Stefano, Naty:
I don't know much about packages, so to don't get lost I sticked to the basics in the following procedure. See, I branched both "Proposed branch" and "Merge into" branches from this MP, and checked *one* file:
$ cd /tmp update/ COPYING
$ mkdir magicicada
$ bzr branch lp:~facundo/ubuntu/maverick/magicicada/0.2-update
Branched 6 revision(s).
$ bzr branch lp:ubuntu/magicicada current-magicicada
Branched 4 revision(s).
$ cd current-magicicada/
$ diff COPYING ../0.2-
$
The COPYING file is the same!
So, I don't understand Stefano why you're finding differences for it, or why Launchpad is showing differences in the "Preview Diff" here below.