Martin v. Löwis wrote:
>> svn revert .
>> svnmerge -M -F
>
> [are you sure you don't need a command for svnmerge here?]
D'oh, I thought I fixed that before sending the message. Yes, that line
should indeed be:
svnmerge merge -M -F
> Instead of these two, I always do
>
> svn resolved .
Tha
> svn revert .
> svnmerge -M -F
[are you sure you don't need a command for svnmerge here?]
Instead of these two, I always do
svn resolved .
Regards,
Martin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/py
Getting the svnmerge-intergrated property right when merging
trunk->py3k->release30 is a little tricky. The most concise set of
instructions I have found which gets it right is to do the following in
the 3.0 maintenance branch after committing to the py3k branch:
svn update
svnmerge merge -r
svn
