[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-15 17:30:38 CEST

On Jun 15, 2005, at 10:23 AM, Russ Brown wrote:

> Hello,
>
> 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?
>

Nope, there's no merge tracking. After running 'svn merge', the
client has no idea where the edits in your working copy came from.
It doesn't know whether they're the result of a merge command, or
whether you hand-edited everything yourself. So when the server
receives those edits, it's still impossible to know where the changes
came from.

---------------------------------------------------------------------
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:36:05 2005

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