On Tue, 29 May 2012 10:52:50 -0500 "Edward K. Ream" <[email protected]> wrote:
> Our nested_splitter changes clashed because I added a pylint: disable > comment. I attempted to use your version, and it looks like I > succeeded, because now pylint complains again. > > Please verify that all your changes remain intact. Hmm, I resolved that conflict in the version I pushed, don't see why it should need doing more than once, assuming you haven't touched nested_splitter.py again since then. > Yech. Rev 5370 restores a change to leoProjects.txt. Please pull > that before verifying. Yay for clones... :-/ checking... trunk> bzr revert -r 5370 tb:la: ~/Package/leo/bzr/leo.repo/trunk trunk> md5sum leo/plugins/nested_splitter.py 9097092de0a311b4d3377ccd4a7eabb4 leo/plugins/nested_splitter.py tb:la: ~/Package/leo/bzr/leo.repo/trunk trunk> bzr revert -r 5368 M leo/doc/leoProjects.txt M leo/doc/leoToDo.txt M leo/scripts/leoScripts.txt M leo/scripts/scripts.leo tb:la: ~/Package/leo/bzr/leo.repo/trunk trunk> md5sum leo/plugins/nested_splitter.py 9097092de0a311b4d3377ccd4a7eabb4 leo/plugins/nested_splitter.py so nested_splitter.py wasn't changed by anything you did, which is as it should be - I usually try to change / commit only the .py files I work on, reverting away all changes in .leo and .txt files, although I'm not sure if that's correct, given that the .txt files clones nodes from the .py files. Cheers -Terry -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.
