Just info: gramps35 has been deleted


2012/12/31 John Ralls <jralls@ceridwen.us>

On Dec 31, 2012, at 1:38 PM, Nick Hall <nick__hall@hotmail.com> wrote:

> On 31/12/12 21:30, John Ralls wrote:
>> Or did you switch to an svn repo and commit from there?
> I switched back to svn to commit to the gramps40 branch.  The commit to trunk was from git.


Make sure that the svn-remote section of your config looks like this:
[svn-remote "svn"]
        url = svn+ssh://jralls@svn.code.sf.net/p/gramps/code
        fetch = trunk:refs/remotes/trunk
        branches = branches/gramps35/*:refs/remotes/*
        branches = branches/geps/*:refs/remotes/geps/*
        branches = branches/maintenance/*:refs/remotes/maintenance/*
        tags = tags/*:refs/remotes/tags/*

Do `git svn rebase` while checked out in the branch to test it. If the rebase is clean, you *should* be able to dcommit in that branch. (I haven't actually tested it yet, but I will shortly.)

You may need to do `git svn reset r20908` to recover from your bad dcommit.

John Ralls

Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
Gramps-devel mailing list