One more question (I'm experimenting... excuse the stupid questions but I'd rather not accidentally mess up the branch). What I did now was, first,

  ~/svnmerge.py merge  -r 96659-96679

just to get started, then

  ~/svnmerge.py merge -F -r 96681,<big list of numbers>,99999

with the list of numbers cut&pasted from the output of "~/svnmerge.py avail". (That second command took a rather long time). What should be the contents of the svnmerge-integrated property after that? svn diff gives me:


Property changes on: .
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-96656
   + /trunk:1-100000,<snip>,103808-103809,1

i.e. it seems to contain exactly the revision numbers I didn't want to merge yet. Is this expected?


Bernd

Reply via email to