First of all, thanks for looking at this merge proposal.
Secondly, Facundo and I are having a hard time trying to understand your (bigger) diff. I'm not an extremely skilled packager, but I weekly package some projects, and by performing the usual steps, I get a smaller diff.
The steps I'm performing are:
* bzr branch lp:ubuntu/magicicada magicicada-0.2
* cd magicicada-0.2
* uscan --verbose --rename
* bzr merge-upstream --version 0.2 ../magicicada_0.2.orig.tar.gz
* bzr st (see output below)
nessita@dali:~/canonical/ubuntu/magicicada/magicicada-0.2$ bzr st
added:
magicicada/tests/test_logger.py
modified:
PKG-INFO
README.txt
data/ui/gui.glade
debian/changelog
magicicada/__init__.py
magicicada/dbusiface.py
magicicada/helpers.py
magicicada/logger.py
magicicada/syncdaemon.py
magicicada/tests/helpers.py
magicicada/tests/test_dbusiface.py
magicicada/tests/test_magicicada.py
magicicada/tests/test_syncdaemon.py
setup.py
pending merge tips: (use -v to see all merge revisions)
natalia.bidart@ca... 2010-09-20 Import upstream version 0.2
nessita@dali:~/canonical/ubuntu/magicicada/magicicada-0.2$ bzr diff | wc -l
2245
Hello Stefano!
First of all, thanks for looking at this merge proposal.
Secondly, Facundo and I are having a hard time trying to understand your (bigger) diff. I'm not an extremely skilled packager, but I weekly package some projects, and by performing the usual steps, I get a smaller diff.
The steps I'm performing are:
* bzr branch lp:ubuntu/magicicada magicicada-0.2 0.2.orig. tar.gz
* cd magicicada-0.2
* uscan --verbose --rename
* bzr merge-upstream --version 0.2 ../magicicada_
* bzr st (see output below)
nessita@ dali:~/ canonical/ ubuntu/ magicicada/ magicicada- 0.2$ bzr st tests/test_ logger. py __init_ _.py dbusiface. py helpers. py logger. py syncdaemon. py tests/helpers. py tests/test_ dbusiface. py tests/test_ magicicada. py tests/test_ syncdaemon. py bidart@ ca... 2010-09-20 Import upstream version 0.2 dali:~/ canonical/ ubuntu/ magicicada/ magicicada- 0.2$ bzr diff | wc -l
added:
magicicada/
modified:
PKG-INFO
README.txt
data/ui/gui.glade
debian/changelog
magicicada/
magicicada/
magicicada/
magicicada/
magicicada/
magicicada/
magicicada/
magicicada/
magicicada/
setup.py
pending merge tips: (use -v to see all merge revisions)
natalia.
nessita@
2245
The complete diff output can be seen at: http:// pastebin. ubuntu. com/497060/
Cheers, Naty.