Zack Weinberg wrote:
>Peter Davis <peter@pdavis.cx> writes:
>
>>(2d): Subversion currently doesn't do "smart merging", but neither
>>does CVS, and it will in the future.
>>
>>
>
>I may try to implement this myself, sometime early next year, if no
>one beats me to it. Shouldn't be hard.
>
Er, Zack? I suggest you think twice before saying "shouldn't be hard"
regarding something most of us have carefully avoided, for sanity's
sake. :-)
Seriously: This is something that's fairly easy to hack up, but
excruciatingly difficult to get right.
>>(2f): I'm not quite sure what this is asking, but AFAIK Subversion
>>doesn't create "microbranches" to resolve conflicts. Conflicts are
>>resolved in the working copy, but remember that copies of all three
>>versions of a merged file are available. How would "microbranches"
>>be used and why are they necessary?
>>
>>
>
>See <http://gcc.gnu.org/ml/gcc/2002-12/msg00487.html> for a lengthy
>explanation.
>
>
>
>>(5): Automatic ChangeLog updates are in the domain of a new
>>post-commit script.
>>
>>
>
>Personally I would prefer a post-checkout/update script, so that the
>file doesn't even exist in the repository, but that's just me.
>
As I said elsewhere, "svn log" gives you exactly what you want, modulo
formatting issues, which can be dealt with.
>>Sounds like an interesting idea, but supporting GCC's or any other
>>project's specific changelog format -- not to mention enforcing
>>humans to use a machine-parseable log message format -- is something
>>that should be handled elsewhere.
>>
>>
>
>Granted. Please read that as a request for the appropriate hooks, and
>(since that change log format is common to GNU projects and has spread
>beyond there) perhaps a place could be found for a user-contributed
>script that does this, in a "sample hook scripts" bundle distributed
>with Subversion.
>
The good news is that Subversion can spit the changelogs out in XML
format, and converting those to anything else should be a piece of cake.
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 11 03:17:32 2002