On Sunday 07 August 2005 15:33, Martin v. Löwis wrote: > 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.
This is what I do with shtoom - I have properties branchURI and branchRev on the root of the branch. I can then use these when landing the branch. It seems to work well enough for me. Anthony -- Anthony Baxter <[EMAIL PROTECTED]> It's never too late to have a happy childhood. _______________________________________________ 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
