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

Re: Auto merging a changeset from a branch to the trunk with a post-commit hook

From: Lorenz <lorenznl_at_yahoo.com>
Date: Wed, 17 Jun 2009 05:46:31 +0000

Chintana Wilamuna wrote:
>Assuming there will be no conflicts, I want to auto merge a changeset
>from developments of a certain branch to the trunk.
>
>Problem I'm having is, committing a given changeset within the
>program. Is there a way to do it without having to checkout the
>revision, and then applying the changeset as a patch?

a merge in subversion always requires a WC of the target path (trunc
in your case).
But nothing prevents you from putting a WC on the server (accessible
from the post commit hook script only).

There are aspects that need careful consideration though:

- blocking the client until the merge is commited or running the merge
as background task (the first would give the opportunity to signal
merge conflicts to the commiter, but block all subsequent commits to
the branch too)

- handling subsequent commits to the branch while the merge is still
running

I would set up a cron job or a process watching the repo for commits
to the branch.

-- 
Lorenz
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2362683
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-17 07:47:35 CEST

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