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

RE: perforce integrate - how to do it in subversion..

From: Monks, Peter <peter.monks_at_vignette.com>
Date: 2005-01-14 20:38:09 CET

G'day Joseph,

Did chapter 4 of the Subversion book help [1]? I found it really
helpful as I went through my first SVN branch/merge cycle.

Cheers,
Peter

[1] http://svnbook.red-bean.com/en/1.0/ch04.html

----------------------------------------------------------------------
Peter Monks http://www.sydneyclimbing.com/
pmonks_at_sydneyclimbing.com http://www.geocities.com/yosemite/4455/
----------------------------------------------------------------------
 
 

> -----Original Message-----
> From: Joseph Silverman [mailto:yossie@laszlosystems.com]
> Sent: Friday, January 14, 2005 11:33am
> To: subversion
> Subject: perforce integrate - how to do it in subversion..
>
> I am used to being able to integrate a whole subtree in perforce into
> another (from which it was, at some point, seperated from with an
> integrate):
>
> 1) p4 integrate branch1/... branch2/...
> 2) p4 edit a bunch of things in branch2 and change them
> 3) p4 integrate branch2/... branch1/...
> 4) p4 resolve branch1/...
> 5) p4 submit branch1/...
>
> How do I do this in subversion? I think merge is the right svn
> subcommand, but I can't make it do what I want!
>
> to writ:
> 1) svn copy branch1/... branch2/... (obviously not use the ... syntax)
> 2) edit the files
> 3) p4 merge branch2/... branch1/... ???
> THIS IS WHERE I GOT LOST..
>
> THANKS
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 14 20:40:52 2005

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