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

Re: svn merge --reintegrate and -c -r options

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 23 Jan 2008 16:07:55 -0800

On Jan 22, 2008 10:23 AM, Paul Burba <pburba_at_collab.net> wrote:
> Should svn merge --reintegrate produce an error if the user also
> specifies -c and/or -r? These are allowed but have no meaning AFAICT.

-c, sure.

Now, I'm pretty sure the reintegrate API lets you specify

  "reintegrate branch-at-revision-123 into this wc"

ie, it doesn't have to reintegrate HEAD. I'm not sure offhand if this
should be specified with -r or with a pegrev though.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
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-24 01:08:05 CET

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