[Python-Dev] PEP: Migrating the Python CVS to Subversion

["Martin v. Löwis"]

Donovan Baarda wrote:
> What this means is SVN has no way of automatically identifying the 
> common version.

Ah, ok. That's true. It doesn't mean you can't do proper merging
with subversion - it only means that it is harder, as you need to
figure out the revision range that you want to merge.

If this is too painful, you can probably use subversion to store
the relevant information. For example, you could define a custom
property on the directory, last_merge_from_trunk, which you
would always update after you have done a merge operation. Then
you don't have to look through history to find out when you
last merged.

Regards,
Martin