Skip to content

Commit b561b6a

Browse files
committed
Merge pull request #490 from mkarg/patch-3
How to deal with peg-revisions
2 parents dcd1137 + 267d8cb commit b561b6a

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

book/09-git-and-other-scms/sections/import-svn.asc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ $ cp -Rf .git/refs/remotes/origin/* .git/refs/heads/
9090
$ rm -Rf .git/refs/remotes/origin
9191
----
9292

93+
It may happen that you'll see some extra branches which are suffixed by `@xxx` (where xxx is a number), while in Subversion you only see one branch. This is actually a Subversion feature called "peg-revisions", which is something that Git simply has no syntactical counterpart for. Hence, `git svn` simply adds the svn version number to the branch name just in the same way as you would have written it in svn to address the peg-revision of that branch. If you do not care anymore about the peg-revisions, simply remove them using `git branch -d`.
94+
9395
Now all the old branches are real Git branches and all the old tags are real Git tags.
9496

9597
There's one last thing to clean up. Unfortunately, `git svn` creates an extra branch named `trunk`, which maps to Subversion's default branch, but the `trunk` ref points to the same place as `master`. Since `master` is more idiomatically Git, here's how to remove the extra branch:

0 commit comments

Comments
 (0)