Martin v. Löwis wrote: > Donovan Baarda wrote: >>What this means is SVN has no way of automatically identifying the >>common version.
> 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 A script named "svnmerge" that does just that is included in the contrib directory of the Subversion tar. We (ZC) have just started using it to track two-way merge operations, but I don't have much experience with it personally yet. -- Benji York _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
