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

Re: [PROPOSAL] Backporting, conflicts and STATUS.

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2004-08-11 00:10:10 CEST

--On Monday, August 9, 2004 2:48 PM -0700 Ben Reser <ben@reser.org> wrote:

> b) If the merge creates conflicts the nominator must resolve the
> conflicts and place a patch, say in a directory called STATUS_PATCHES.
> The patch will be named after the revisions it is merging. A note will
> be included in the STATUS file mentioning that there is a conflict and
> a resolved patch exists in the STATUS_PATCHES dir.

How about a cheap branch instead? Your proposal would make sense for, say,
CVS; but this is Subversion.

Let's all sing the praises of cheap branches. ;-) -- justin

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 11 00:10:31 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.