-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2011-03-22 12:16, Michael Diers wrote: > On 2011-03-17 17:38, Max Bowsher wrote: > [...] >> It might be best to push your proposed branch to Launchpad: > >> bzr push >> --stacked-on=bzr+ssh://bazaar.launchpad.net/~svn/ubuntu/natty/subversion/ppa >> lp:~mdiers/ubuntu/natty/subversion/ppa-proposed > >> (The lp: shortcut doesn't work for --stacked-on= at the moment) > [...] > You've changed the versioning scheme, and included two hyphens in the > string - this is wrong, since it will change the name of the > .orig.tar.gz that is looked for. The version should be 1.6.16dfsg-1svn1 > [...] > > Max, > > thanks for your comments. I did as you suggested, and proposed my > changes for merge. > > https://code.launchpad.net/~mdiers/ubuntu/natty/subversion/ppa-proposed/+merge/54325
The PPA now has subversion 1.6.16dfsg-1svn1 packages for Natty, Maverick, Lucid, Karmic, Jaunty, and Hardy. I'm afraid I slightly messed up the merge to jaunty, http://bazaar.launchpad.net/~svn/ubuntu/jaunty/subversion/ppa/revision/46. Derived files that are part of the source distribution (e.g. the "configure" script) have disappeared. I suppose I committed the tree after inadvertently running "make distclean". Should I resurrect those files on that branch? (Should the derived files be under version control in the first place?) Another thing regarding bzr merge: I merged the changeset following the cascading of branches, natty -> maverick -> lucid -> karmic -> (jaunty, hardy). This was fine, except for debian/changelog, which requires some attention after a merge anyways. But, using this scheme, the changelog picks up all the interim entries from the preceding branches as well. I guess it might be better to merge directly into the target branches, from the development branch that the change originates on, like so: natty -> ( maverick, lucid, karmic, jaunty, hardy). Do you agree? - -- Michael Diers, elego Software Solutions GmbH, http://www.elego.de -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk2MyRAACgkQcEKlWnqVgz2QSACeIrL70syO1GipyB13NVdmIbvs uHgAn2AyY+SkhwjO3ammTlL79uNlB7XA =yb/t -----END PGP SIGNATURE----- _______________________________________________ Mailing list: https://launchpad.net/~svn Post to : svn@lists.launchpad.net Unsubscribe : https://launchpad.net/~svn More help : https://help.launchpad.net/ListHelp
