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

Re: Finalizing what's in 1.5

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 10 Jan 2008 15:53:58 -0500

On Jan 10, 2008 6:46 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> "David Glasser" <glasser_at_davidglasser.net> writes:
> > (There's no reason not to include both features, by the way; they're
> > orthogonal. I just don't want to include issue-2897 at all unless
> > several people have been convinced that it actually works well.)
>
> David said exactly what I would have said.
>
> The issue-2897 stuff will be very useful, but it is *not* necessary
> for maintaining and merging back feature branches. The --reintegrate
> thang will take care of the common case there.

Here is a simple question I still do not understand the answer to.

I am sitting in a trunk WC. I run this command:

svn merge url://feature-branch

Why do I need to specify --reintegrate? Why can't we just see that
feature-branch meets our criteria for using --reintegrate and then do
it. And it it does not, allow the work Kamesh is doing to come into
play?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-10 21:54:28 CET

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