[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: Chintana Wilamuna <chintanaw_at_gmail.com>
Date: Wed, 17 Jun 2009 10:49:38 +0530

On Tue, Jun 16, 2009 at 9:40 PM, Tyler Roscoe<tyler_at_cryptio.net> wrote:

> This sounds scary. What are you trying to accomplish?

Auto merge all commits to a branch to the trunk of a project. So the
idea is to keep the branch and trunk in sync, taking off the merging
responsibility from developers.

> How do you propose to handle merge conflicts or other non-standard
> results, especially without a working copy?

Yes Tyler, I know the inherent problems with it but this has been
decided based on two assumptions.

1. Probability of a conflict is low.
2. Cost of a conflict is low than the cost of not getting a commit
that does not conflict to the trunk.

Bye,

    -Chintana

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

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