Greg Hudson wrote:
> I commit twenty files in ten widely separated directories. Which
> directory's template gets used?
>
> This is one of the questions Karl initially started out trying to
> answer, and he found that the answer wasn't obvious, which led him to
> the idea of punting to a server hook. Yet you and four other of this
> morning's contributors to the conversation seem to have simply glossed
> over the question, instead considering issues like how the user might
> easily set the same template for many directories. Perhaps you all have
> some simple, adequate idea in mind ("the template for the anchor of the
> commit", perhaps), but I really can't tell.
And I cannot tell why placing the burden of determining primacy on the
server hook solves the problem in any way either. Some process still
has to determine which competing log-template gets used; by punting
completely, you place *all* of the burden on the site admin to take this
[possibly marginal in real life] use-case into consideration when
writing the hook script.
Here's a couple of ideas for dealing with conflicts (straight from my
brain to your eyes, no thought to complexity of implementation):
1) Highest One Wins - the template in force for the shortest path that
contains all committed file paths.
2) To Each His Own - If those 20 files are covered by 3 log-templates
(for example), then the client splits the commit into 3 seperate
commits, each with it's own custom template. We should be able to
assume that if a site has that many templates scattered about their
tree, then that should be taken as a significant factor and we should
respect the effort and not impose a single template.
Of course, in both cases a --no-log-template switch to the client should
shut off all special processing and lead to the existing "dumb"
template. Any site wishing to require specific formatting has to use
the pre-commit hook to validate the text anyways.
John
--
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 19 18:18:58 2005