ansaurus

Question

Answer 1

+1 A:

Generally speaking, you'll want to branch on the server, then make your changes in the branch, then check those changes in.

So, first step is to create the branch, which is just a copy command. In Tortoise, you need the URL to (presumably) the trunk, and you'll need to define the URL of the branch. In a more standard repository setup, the trunk might be http://svnserver/svn/repository/trunk and your branch might be http://svnserver/svn/repository/branches/Oct13.

Then, you'll want to switch your working copy to the branch. You should have the option to do so without losing your local changes.

Finally, you would check your changes in, and they should go to the branch from there.

I'm more accustomed to the command-line interface for svn, but I have used Tortoise. It's been a while, though, so leave a comment if you still have trouble or this doesn't make sense.

Andrew 2010-10-13 15:35:15

thanks. pls. see update. I tried the command line instruction as well, in vain.

anjanb 2010-10-13 15:44:36

@anjanb Could you post the output of <code>svn info</code> while in your main working directory?

Andrew 2010-10-13 15:48:05

Path: .URL: http://reposerver/svn/myrepositoryRepository Root: http://reposerver/svn/myrepositoryRepository UUID: 7a31d3c0-b288-4695-aecd-3f9dda2861abRevision: 235Node Kind: directorySchedule: normalLast Changed Author: anjanLast Changed Rev: 235Last Changed Date: 2010-10-13 20:39:31 +0530 (Wed, 13 Oct 2010)

anjanb 2010-10-13 15:58:33

Answer 2

+1 A:

When you say:

I logged into my linux box to see if the "branches" folder was NOT available; However, I could see that /var/svn/repository/branches existed.

Do you mean that the actual directory exists in the filesystem (which will do you absolutely no good), or that it exists in the repo?

Possible fix:

$ svn mkdir http://reposerver/svn/repository/branches
$ svn copy http://reposerver/svn/repository/ http://reposerver/svn/repository/branches/BFI_`date +%b%d`/ -m "Creating a branch"

Wrikken 2010-10-13 15:54:48

hi Wrikken, thanks. I meant that the actual directory exists in the fs. Will try your suggestion and see how it goes.

anjanb 2010-10-13 16:01:05

that kinda did the trick. BUT holy cow, when I tried to update my "trunk" working copy, I got a new folder called branches/Oct13 with a full copy of my trunk directory structure. Now, how do I get rid of this directory. pls. help --- we're about to make a release soon and this new directory at the root of the "TRUNK" working copy is going to break the build. thank you.

anjanb 2010-10-13 16:09:57

c:\new_workingCopy>svn mkdir --parents http://repoServer/svn/myrepository/branches -m "creating branch"Committed revision 236.c:\new_workingCopy>svn copy http://repoServer/svn/myrepository/ http://reposerver/svn/myrepository/branches/BFI_Oct13/ -m "Creating a branch"Committed revision 237.

anjanb 2010-10-13 16:14:49

There are no 'special' branches in subversion: `branches` is just a directory. Normally, in the root of an svn repo you'd create a `trunk` and `branches` folder yourself after creation. If you didn't at the start, and just added the project directly to the 'root' / `/` of the repo, it will be a subfolder indeed. Possible workaround is to create a folder `trunk` now, and move the current content of the root sans branches dir into that location. If you need the files to stay at the current location, you'll either have to live with the branches subfolder, or forget about branching altogether.

Wrikken 2010-10-13 16:16:10

in the above command there is a h t t p : / / missing because of some filtering by the edit control.

anjanb 2010-10-13 16:16:46

Wrikken : thanks. I understand what happened now. How do I get rid of the branches/Oct13 directory tree ? I will attempt the branching a lil later. First I need to undo what I did earlier. thank you.

anjanb 2010-10-13 16:19:30

`svn rm http://reposerver/svn/myrepository/branches/BFI_Oct13/`

Wrikken 2010-10-13 16:22:47

that worked. thank you. Now, after creating a "trunk" folder, how do I move the current content of the "root sans branches dir" to the "trunk" folder ? thanks again.

anjanb 2010-10-13 16:30:21

Just perform a `svn mv`, see `svn help mv` for more details.

Wrikken 2010-10-13 16:34:22

thank you. I will award your answer.

anjanb 2010-10-13 16:40:27

ansaurus

tags:

views:

answers:

creating a subversion branch

related questions