Michael Bienia wrote:
> bzr should inform me that it might have problems with pushing later due
> to different repository format *before* I start working on a branch.
These two branch formats are model-compatible-- that is, they are both
rich-root formats. So you could push revisions from your local merge
into lp:ubuntu/fuse.
stacking should just be smarter about these situations, and either
- - do an unstacked push
- - select the same target format as the stacking branch.
> In
> the end I redid this whole merge by branching again (but now without a
> bzr init-repo) so it kept the repository format and I could push it to
> LP successfully.
That's a shame-- you could have just branched locally and upgraded the
local copy to --2a.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Michael Bienia wrote:
> bzr should inform me that it might have problems with pushing later due
> to different repository format *before* I start working on a branch.
These two branch formats are model-compatible-- that is, they are both
rich-root formats. So you could push revisions from your local merge
into lp:ubuntu/fuse.
stacking should just be smarter about these situations, and either
- - do an unstacked push
- - select the same target format as the stacking branch.
> In
> the end I redid this whole merge by branching again (but now without a
> bzr init-repo) so it kept the repository format and I could push it to
> LP successfully.
That's a shame-- you could have just branched locally and upgraded the
local copy to --2a.
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkt ndggACgkQ0F+ nu1YWqI0ptACdFf 3irvbP1eJZ1Zk5S GzIxp63 BQEh+Spxg0USIsM cV
DJEAnAxGzOL33or
=Uigj
-----END PGP SIGNATURE-----