On Wed Dec 09 17:55:42 UTC 2009 John A Meinel wrote: > Perhaps 'merge-package' is doing something fancier which is causing the > breakage?
Yes, it is. It's still just merging revisions of the two branches together, but in a different manner.
You can do the steps yourself with (starting in the Ubuntu branch):
bzr push ../upstream -r tag:upstream-2.6.22 cd ../upstream bzr merge lp:debian/smarty -r tag:upstream-2.6.26 bzr revert -r branch:lp:debian/smarty bzr ci -m "merge upstreams" cd ../smarty bzr merge ../upstream Doing this shows something odd, the first push gives an unclean status:
added: debian/ debian/Makefile debian/NEWS debian/README.Debian debian/changelog debian/compat debian/control debian/copyright debian/dirs debian/docs debian/lintian-override debian/rules renamed: BUGS => BUGS COPYING.lib => COPYING.lib ChangeLog => ChangeLog FAQ => FAQ INSTALL => INSTALL NEWS => NEWS QUICK_START => QUICK_START README => README RELEASE_NOTES => RELEASE_NOTES TODO => TODO demo/ => demo/ libs/ => libs/ misc/ => misc/ unit_test/ => unit_test/ modified: libs/plugins/function.math.php
It appears as though there are changing root ids between some of the strands here.
Thanks,
James
On Wed Dec 09 17:55:42 UTC 2009 John A Meinel wrote:
> Perhaps 'merge-package' is doing something fancier which is causing the
> breakage?
Yes, it is. It's still just merging revisions of the two branches together,
but in a different manner.
You can do the steps yourself with (starting in the Ubuntu branch):
bzr push ../upstream -r tag:upstream-2.6.22
cd ../upstream
bzr merge lp:debian/smarty -r tag:upstream-2.6.26
bzr revert -r branch:lp:debian/smarty
bzr ci -m "merge upstreams"
cd ../smarty
bzr merge ../upstream
Doing this shows something odd, the first push gives an unclean
status:
added: README. Debian lintian- override plugins/ function. math.php
debian/
debian/Makefile
debian/NEWS
debian/
debian/changelog
debian/compat
debian/control
debian/copyright
debian/dirs
debian/docs
debian/
debian/rules
renamed:
BUGS => BUGS
COPYING.lib => COPYING.lib
ChangeLog => ChangeLog
FAQ => FAQ
INSTALL => INSTALL
NEWS => NEWS
QUICK_START => QUICK_START
README => README
RELEASE_NOTES => RELEASE_NOTES
TODO => TODO
demo/ => demo/
libs/ => libs/
misc/ => misc/
unit_test/ => unit_test/
modified:
libs/
It appears as though there are changing root ids between some of the
strands here.
Thanks,
James