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

Re: Merging With Concurrent Development

From: Peter Kahn <citizenkahn_at_gmail.com>
Date: 2006-10-20 17:26:44 CEST

On 10/19/06, Bob Proulx <bob@proulx.com> wrote:
> Peter Kahn wrote:
> You could always go into real estate.
> Bob

I don't on a blazer so that's out.

Merging early and often is what we'll try. I just wish the merge
tracking feature was implemented so the end-of-project merge was
simpler. Hopefully in 1.5.

The other thing we are adding is a message-of-the-day for each branch.
 A user checks in to branch A and gets a message back reminding him to
merge that code to branches C, E, G. This works provided that I can
pipe the message back to his client. If its an email, then the spam
factor will make it a major annoyance.

Peter Kahn
citizenkahn@jabber80.com, pkahnpie1@AIM, skype: citizenkahn
http://kahnstipation.blogspot.com | http://analogoustendencies.blogspot.com/
Awareness - Intention - Action
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 20 17:27:44 2006

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.