Branching/Merging Question

[Nick Floersch <Ni...@stone-env.com>]

Hi all,

I am a relative novice SVN user. I have been using it to manage a
project for a while - and am familiar with commiting, updating,
deleting, moving ... The basics.

About a month ago the project needed to branch. I did not really know
enough about SVN at the time, and instead of doing and svn copy to
create and official svn branch, I just made a copy of the working copy I
had and edited it as its own stand-alone entity. Not the wisest thing
I've done, but I was the only developer and at the time, it seemed more
important to get the job done than deal with SVN.

Now, I want to see if there is some way to re-import this branch as an
svn branch - so that I can merge some changes from it back into my main
SVN repository's trunk. I have a feeling I may need to go through the
files with a diff program and manually locate the changes I made to this
non-svn branch, and put those changes back into the trunk. But can I do
both the manual diff search/merge and somehow import this non-svn branch
as an svn-branch as well - so that after I manually bring each change
back into the trunk, the trunk and branch will be synced in the places I
need them synced?

I hope the question makes sense - I suspect I've screwed myself here and
need to find the best way out of the quicksand.

-Nick

---
Nicholas E. Floersch (pr. Floorsh)
IT Group Manager
Direct / 802.229.1872   Cell / 802.249.2516    
E-Mail / nfloersch@stone-env.com 
Stone Environmental, Inc.
535 Stone Cutters Way, Montpelier, Vermont 05602
Tel / 802.229.4541   Fax / 802.229.5417
Web Site / www.stone-env.com
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Branching/Merging Question

[Ben Collins-Sussman <su...@collab.net>]

On Jun 3, 2005, at 2:58 PM, Nick Floersch wrote:
>
> I hope the question makes sense - I suspect I've screwed myself  
> here and
> need to find the best way out of the quicksand.


$ svn cp trunkURL newbranchURL -m "Create new branch".
$ cd renegade-working-copy
$ svn update   # resolve any resulting conflicts
$ svn status   # verify that you still have all your local changes
$ svn switch newbranchURL
$ svn commit -m "commit changes to new branch"


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org