Import/commit to svn branch from a different codebase

I am trying to migrate to svn from a not-so-famous version control system (lets call it nsfvc). svn trunk was created some time ago from nsfvc's trunk. There is an active branch in nsfvc that I have to import to svn branch. The diff between nsfvc's trunk and branch is huge (updates, renames, additions, deletions, moves).

How do I go about doing this? I am guessing it is not as simple as...

svn co http://mysvn/repo/branches/branch c:\workspace # replace files in c:\workspace svn add svn ci

-------------Problems Reply------------

I hope I'm not misunderstanding, but my advice is:

  • create the svn branch from the nsfvc branch the same way you created the svn trunk from the nsfvc trunk. (I assume svn import?)
  • at this point you should have mirrored the state of the nsfvc repository in the svn repository
  • you should now be free to svn merge between the svn trunk and svn branch. svn merge is simply the process of applying diffs. You needn't setup some special connection between the trunk and the branch.
  • assuming you are running svn 1.5.x or 1.6.x, you can use svn mergeinfo to track subsequent merges between the trunk and branch
Category:svn Views:0 Time:2010-04-30

Related post

  • Git: How to commit into SVN branch after rebase? 2010-02-17

    I have a problem with a SVN branch. I made a checkout of it with git checkout -t -b stable svn/stable. Then I did a merge with git rebase master. After that I tried to commit the merge changes into the remote branch with git svn dcommit But now it se

  • git svn imported repository using svn branches 2010-08-24

    I've cloned a replicated svn repository (svnsync to local file system). All the branches etc. are now available in git. Now i would like to start working on svn branches git checkout remotes/B_XYZ and doing some commits via git. Now i want to change

  • How do I import one specific SVN branch to a git repository? 2010-07-07

    We recently moved from SVN to Git, but there's a single legacy branch that I need to bring in to the Git repository. The SVN and Git repositories are the same logical code (i.e. they're both called foo-lib), but the Git one has newer revisions from a

  • Best way to run unit tests after each commit ? - svn - branch per feature 2008-09-19

    What is the best way to run your suite of unit tests after each commit? I'm particularly interested in the case that you do all of your features/changes in branches and keep your trunk stable. My source control is SVN and I use tortoise SVN as my cli

  • Importing an svn branch into git 2009-02-05

    I am new to git, and have a subversion repository that I want to be able to import into a git repository occasionally (for deployment). So I want to perform most of the updates using svn but wanted to see what's the best way to push it to git (just t

  • How to import svn branches and tags into git-svn? 2010-02-11

    I have got a central SVN repository I must commit to, but I've got a passion for git (like any other developer I know). The case is well known. Then I read about git-svn and gave it a try. Since I don't need the full history, just from two months or

  • svn branch commit - experimental commit 2010-03-13

    I've made some experimental code that I would like to save in the repository, but I don't want it on the main branch. How would you commit this to a branch? Maybe I got this wrong, but of what I've understood about branching, all you actually do is c

  • git-svn trying to commit to wrong branch 2012-01-30

    git-svn dcommit is trying to push to the wrong SVN branch. Here's what I did: git checkout -b branch_a svn/branch_a # git-svn clone prepended all remote SVN branches with svn/ git svn branch -m "a message" branch_b git checkout -b branch_b svn/branch

  • Grafting a Git history onto an SVN branch 2008-09-22

    The situation I have a Git repo and an SVN repo that both hold the same source code but different commit histories. The Git repo has a lot of small well commented submits... while the SVN repo has a few huge commits with comments like "Lots of stuff"

  • Can you specify which svn branches with git svn? 2009-01-15

    I think my question is somewhat similar to CaptainPicard's but dissimilar enough that I feel compelled to ask so here goes. I have an old SVN repository with around 7500 revisions and part of those 7500 revisions are some pretty large .fla files. And

  • git-svn merge 2 svn branches 2010-04-22

    I'm using svn. I have two branches and on both of them were performed a lot of changes. In addition of one of the branches a lot of files were renamed, so now svn can not help me merge changes in those files (well know svn limitation). Is it possible

  • Avoid non pre-tested commit in SVN commits 2010-08-27

    Please help me with this: how can Avoid non pre-tested commit in SVN commits??? --------------Solutions------------- You can't really force anybody to do anything before committing*, all you can do is test the committed code at each time. To quote @T

  • How to get a new data in an existing repository of git and commit to svn? 2011-04-19

    I am using git-svn to get a data in svn repo from git. I successfully did import data from git to svn with submodules (I converted submodules as sub-tree of git) using some around work, and it worked fine. But now I am getting stuck. If I want get a

  • How do I make git-svn use a particular svn branch as the remote repository? 2008-10-10

    A word of warning: I'm a n00b to git in general. My team uses feature branches in svn, and I'd like to use git-svn to track my work on a particular feature branch. I've been (roughly) following Andy Delcambre's post to set up my local git repo, but t

  • Why am I able to create the same SVN branch twice? 2008-12-02

    I am able to create the same SVN branch twice. I would hope that SVN would not allow me to create same branch again. Please help me to fix this issue. --------------Solutions------------- From SVN RedBook: Subversion has no internal concept of a bran

  • Which naming conventions do you use for SVN Branches and Tags? 2009-03-25

    Our company is creating a naming convention for SVN branches and tags, and I'm not confortable with the idea of using only date or build number on branches/tag names. I think we need names that brings a greater definition about what this path represe

  • How to switch svn branches using git-svn? 2009-04-08

    Duplicate How do I make git-svn use a particular svn branch as the remote repository? I am using git-svn to track development by someone else on svn. I'm trying to figure out how to use gti-svn to switch from one svn branch to another. All the exampl

  • Automatically switch between SVN branches of the same project 2009-05-28

    How can developers set up their environment paths when working on different SVN branches of the same project so that they don't need to setup their paths each time they switch from one branch to another? I am a Python developer and I find myself work

  • SVN Branching in Eclipse (Conceptual) 2009-07-22

    I understand the basic concept of a branch and merge. All of the explanations I've found talk about branching your entire trunk to create a branch project and working on it and then merging it back. Is it possible to branch a subset of a project? I t

Copyright (C), All Rights Reserved.

processed in 0.216 (s). 11 q(s)