Re: [Gramps-devel] The 3.0 branch as been created!

[Brian M. <br...@gr...>]

Doug,

> I have this file structure now:
> 
> ~/gramps/gramps30
> ~/gramps/trunk
> 
> where I have checkouts from
>
https://gramps.svn.sourceforge.net/svnroot/gramps/branches/gramps30
> and
>
https://gramps.svn.sourceforge.net/svnroot/gramps/trunk
> respectively.
> 
> If I have fixes that go into both, what do I do?
> Thanks for any hints.

1) First commit your fix in one of the branches. Let's
say you commit to trunk first.

2) Note the commit revision. Let's say the new
revision is 123456

3) cd into the 3.0 branch directory
(~/gramps/gramps30)

4) Run 
svn merge -c 123456
https://gramps.svn.sourceforge.net/svnroot/gramps/trunk

If there are no conflicts, you can just commit it. If
there are conflicts, you need to resolve those first.

~Brian