[Python-Dev] Commands for correctly merging to the python 3.0 maintenance branch

[Nick Coghlan]

Martin v. Löwis wrote:
>> svn revert .
>> svnmerge -M -F <py3k-rev>
> 
> [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 <py3k-rev>

> Instead of these two, I always do
> 
>   svn resolved .

That's what I had been doing before today, and I believe it works
correctly so long as you never get the svn update and svnmerge merge
operations out of sequence (i.e. always update and only then merge).

However, I encountered the case today where I had already merged to the
maintenance branch and did the svn update afterwards. In that situation,
reverting the property changes and reapplying them was the only way for
me to avoid losing the record of the changes everyone else had already
merged.

If I hadn't checked the property diff and noticed that several merged
revisions were no longer listed in the property in my working copy, then
svnmerge may have become very confused. The
revert+redo-merge-bookkeeping approach is definitely slower than just
marking the conflict as resolved, but has a definite advantage in doing
the right thing even if the earlier update+merge operations were
performed out of sequence (or if an extra update becomes necessary due
to checkins after the merge was performed).

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia
---------------------------------------------------------------