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

perforce integrate - how to do it in subversion..

From: Joseph Silverman <yossie_at_laszlosystems.com>
Date: 2005-01-14 20:33:16 CET

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
Received on Fri Jan 14 20:35:34 2005

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