Yaroslav Halchenko wrote: >> as Barry seems busy, > >> are you able to combine pyton-mode.el from branch with remaining files from > trunk? well -- now -- "not natively" since if I merge your branch I > loose those removed files: > > $> git merge bzr/a-roehler > Merging HEAD with bzr/a-roehler > Removed README > Removed doctest-mode.el > Removed pycomplete.el > Removed pycomplete.py > Auto-merged python-mode.el > > may be in bzr there is a native way to handle merges on per-file basis > but unfortunately I am not familiar with bzr. > > I can always though generate a patch of your modifications in python-mode and > apply within my local copy of the master branch, but that is not "native" > way and brings even more confusion. > > It might be that if you added those files back, bzr would be able to > handle situation gracefully...
OK. I'll try that. Have not that much experience with bazaar too... I'll wait some days still, maybe Barry has another idea. Cheers Andreas > git does apparently: > > So, I've added those files back within a local copy of your branch and then > tried to merge your branch back into the master > > *$> git merge a-roehler > Merging HEAD with a-roehler > Auto-merged python-mode.el > Merge made by recursive. > python-mode.el | 374 > ++++++++++++++++++++++++++++++++++++++++++++++++++++---- > 1 files changed, 349 insertions(+), 25 deletions(-) > > >> BTW as branch changes still, please tell about your deadlines, if you want >> to build it in. > > I am just a little person -- a maintainer of python-mode.el for Debian. I've > already shipped current version into Debian, and would be happy to ship a new > version with your modifications if they propagate reach master > branch > >> No bugs concerning my changing known so far. > > nothing is good than a real field testing by hunders of users -- > unexpected aspects of code functioning get unraveled ;-) > _______________________________________________ Python-mode mailing list Python-mode@python.org http://mail.python.org/mailman/listinfo/python-mode
