On Sat, Dec 08, 2007 at 02:04:38AM +0100, Miklos Vajna wrote: > hi, > > i'm using git-svn for projects where i don't just want to commit to > trunk but to other branches, too. > > for example: > > git-svn clone -s svn+ssh://vmiklos@xxxxxxxxxxxxx/svn/ooo-build ooo-build > > then i have a local 'master' branch and all the other branches are local > branches. > > so, when i want to work in the ooo-build-2-3 branch, i do a: > > git checkout -b ooo-build-2-3 ooo-build-2-3 > > but when i do a git svn rebase, i get: > > warning: refname 'ooo-build-2-3' is ambiguous. > > what am i doing wrong? Try using 'git svn rebase remotes/ooo-build-2-3'. git-svn should produce its branches under refs/remotes/* and your local branches are under refs/heads/*. By using 'git checkout -b ooo-build-2-3 ooo-build-2-3' you created refs/heads/ooo-build-2-3 as a copy of refs/remotes/ooo-build-2-3 and now using only ooo-build-2-3 is ambigious. (at least in some cases where git won't take refs/heads/ooo-build-2-3) > > in fact i suspect that in case i would use some other branch name, like > simply '2-3' then i could get rid of this warning, but that's the > problem with using the equivalent name of the remote branch when working > in a branch locally? > See above. > probably i miss some parameter to git-svn clone so that it would prefix > the refs with some 'origin'? Look up --prefix in the manpage for git-svn. -Peter - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
