CODEWITHSUNDEEP
gitsvnversion-control
DenCowboy
DenCowboy

Reputation: 15116

Difference trunk vs master branch after svn to git migration

I performed an svn to git migration. I see my branches + a lot of additional trunk branches. How do I have to interpret those branches? I already have a master (which I've defined as the trunk with --trunk dev).

When I show my branches I have something like this:

* master
  prod
  test
  trunk@123
  trunk@432
  trunk@892
  trunk@1023
  trunk@1134

While my master is the dev branch in svn (we defined dev as our trunk).

Upvotes: 3

Views: 5323

Answers (1)

Jan Hudec
Jan Hudec

Reputation: 76376

git-svn creates the branches with @revision suffix when the changeset on branch in revision is not parent of the changeset on branch in revision+1.

That is, you get trunk@123 if the next change to /trunk after 123 (not necessarily 124; as that can concern different path) deleted it and replaced it with new content, likely by copying it from /branches/dev (or /dev or how you had it called).

In Subversion, changes live on branches, so you can always access that state as trunk@123, but in Git, commits are only linked in the DAG, so since these commits have no successor (as the branch was rewritten from elsewhere), the commits would not be accessible without these branch labels.

Upvotes: 2

Related Questions