I'm not sure what the best thing is to do here. This situation should be unusual, and it does not corrupt any of the data in the original Subversion or Bazaar repositories. It's only a problem if you push introduce a new file in a merged revision that is not changed by the merging revision and then try to pull those changes down to a bzr repository that is older than 2a. Even after that, bzr will complain but the data should be ok.
Putting a newer version of bzr-svn into Lenny wouldn't really be an option, as this would require us to put newer versions of bzr, bzr-gtk, etc in as well. This would be too risky. I don't think removing bzr-svn completely would be necessary. Another alternative would be to simply disable the ability to do round-tripping pushes (or round-tripping pushes of merges?) into Subversion and only allow dpush. Thoughts? -- Jelmer Vernooij <jel...@samba.org> - http://samba.org/~jelmer/ Jabber: jel...@jabber.fsfe.org
signature.asc
Description: This is a digitally signed message part