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

Re: Repeated merge strategies

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-12-22 04:04:45 CET

Greg Hudson <ghudson@MIT.EDU> writes:
> Okay, with some help from Bill Tutt, I think have deciphered the
> nature of the conflict between Branko and Nathanael Nerode on repeated
> merge strategies. We don't necessarily have to solve this issue
> before 1.0, but I thought it might be nice to describe what's going in
> as concise a matter as I can manage.

Thank you! This email was a service to humanity :-).

Do you want to store this somewhere in notes/ so we don't lose track
of it?

Off the top of my head, I can't think of an ancestry-tracking
mechanism (MRA, AS, or otherwise) simple enough to go into 1.0. But
maybe your email will inspire a proposal from someone...

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 22 04:46:18 2002

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