Local branches in subversion

Question

Do you have advice on how one could work on a local branch while doing SVN development? I'm working on a project where I can't have a branch in the central repository, but I'd like to be able to merge the contents from trunk every now and then.

Many website recommend using git, but I'm not so used to git, and I'm not really used to that. Another possibility would be to work on a clean checkout, and never commit; but that would mean duplicating many unmodified files.

Any idea regarding local branches in svn?
Thanks!

Answer 1

SVN是集中式的，因此它不知道本地分支。

Answer 2

Tis time to learn git. Try git-svn. (Or you could use another SVN-DVCS bridge)

Answer 3

This workflow in SVN involves you having a second SVN repository where you work.

You move changes to and from the main repository using patches.

It is less than ideal these days.

Tis time to learn Hg. ;)

Answer 4

A less than optimal solution, which doesn't involve git, is to make changes to a fresh local checkout, without committing them, and consider this checkout as a local branch. One can then merge from trunk through svn update , and commit to trunk through svn commit when their work on the branch is completed.

This solution doesn't let one keep a history of the branch, though.