[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Detecting merges

From: Olivier Sannier <obones_at_free.fr>
Date: 2005-06-15 17:37:20 CEST

Russ Brown wrote:

>Is there any way (other than depending on developers providing
>parsable commit logs) of detecting at the hook stage whether a given
>commit contains a merge or not?
>What I want to be able to do is set a revision property automatically
>in such cases, which I intend to use in other scripts for helping to
>calculate required merges (among other things).
Maybe I'm being stupid here, but don't all commits contain a merge?
I mean, if I commit something, it's a change to the file, hence, a merge
is required to get this change.
Or maybe you have another meaning for the word "merge" which I'm not
getting here.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 15 17:43:27 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.