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

RE: can *never* use merge with --reintegrate

From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 12 Oct 2009 12:23:01 -0400

> > I'm in Ubuntu and yes, the current directory is
>
> I was referring to the strange backslash in your command. It couldn't
> be a
> Windows path anyway, that would have to appear after the URL.
>
> >> Reintegration is a stage after "genuine" merging. First you have to
> merge
> >> /trunk into /branches/pat, commit that (which in this case will only
> send a
> >> svn:mergeinfo attribute). Then reintegration should work.
> >
> > OK, so what are the steps, really. I find the RedBean on this
> terrible.
>
> First prepare the branch for reintegration:
>
> svn co .../sandbox.../branches/pat pat
> cd pat
> svn merge .../sandbox.../trunk
> svn commit

You probably want to do an svn up here after the commit too.
 
> Then reintegrate:
> svn co .../sandbox.../trunk trunk
> cd trunk
> svn merge --reintegrate .../sandbox.../branches/pat
>
> --
> Stein

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2406721

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-12 18:23:57 CEST

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