[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch

[Brett Cannon]

On Thu, Jan 29, 2009 at 19:03, "Martin v. Löwis" <martin at v.loewis.de> wrote:
> Brett Cannon wrote:
>> On Thu, Jan 29, 2009 at 18:27, "Martin v. Löwis" <martin at v.loewis.de> wrote:
>>>> There are potential problems with doing it that way [1]. The safer
>>>> option is to do:
>>>>
>>>> svn revert .
>>>> svnmerge merge -M -F <py3k-rev>
>>> I still don't see the potential problem. If you do svnmerge, svn commit,
>>> all is fine, right? The problem *only* arises if you do svnmerge,
>>> svn up, svn commit - and clearly, you shouldn't do that. If, on commit,
>>> you get a conflict, you should revert all your changes, svn up, and
>>> start all over with the merge.
>>
>> I did do that and I still got conflicts.
>
> What is "that"? "svn revert -R" (plus rm for all added files),
> "svn up", "svnmerge", "svn revert ."?

svn up
svnmerge
... conflicts
svn revert -R .
svn up
svnmerge
... same conflicts


>
> What conflicts?

Some metadata on '.'.

-Brett