Paul McNett wrote: > Ed Leafe wrote: >> I'll fix both of these and re-commit. But I'm very interested in >> learning why svn didn't catch that your version was old before >> allowing you to commit. > > Here's the likely scenario: > > 1) Nate has __init__.py open in his editor, and makes his changes. > > 2) He does a 'svn update' which gets Ed's latest changes. > > 3) He issues File|Save in the editor. > > Between steps 2 and 3, the __init__.py on disk is up to date with > subversion, even though __init__.py in Nate's editor is his modified > version.
There are 2 lessons from this that I can think of: 1) Don't 'svn update' while you have any of the files open. 2) Do an 'svn diff' before your 'svn commit' to make sure the changes are what you expected. Except for the most trivial of changes, I always do this sequence: svn diff > p vi p --- I write the changenotes at the top of --- file 'p', as I'm reviewing the diff --- during this, I may find something I --- forgot to do, at which point I go make --- more changes and start over again with --- another 'svn diff > p'; vi p --- finally, ready to commit: svn commit --- here, I may get a subversion 'out of date' --- message, at which point I: svn update --- I'll look for the dreaded 'C', and note any --- 'G' indicating a merge took place. I'll test --- the new HEAD to make sure it still works as --- expected, and finally issue the 'svn commit'. Paul _______________________________________________ Post Messages to: [email protected] Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev Searchable Archives: http://leafe.com/archives/search/dabo-dev This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]
