Bernd Schmidt <[EMAIL PROTECTED]> wrote: > One additional question, suppose I don't want to merge a huge number of > revisions in one go, and I do > svnmerge.py merge -r a-small-list-of-revisions > svn diff ;; to verify everything is OK > > Do I then have to commit the merge so far before running svnmerge.py > again, or can it get all the information it needs from the local repository?
No need to commit, but you'll have to use --force (-F), as otherwise it'd abort saying that your working copy is dirty. -- Giovanni Bajo
