From: Tim L. <guy...@gm...> - 2011-12-02 01:03:48
|
I tried the merge command as here: http://www.gramps-project.org/wiki/index.php?title=Brief_introduction_to_SVN#Merging_changes_from_the_branch_back_into_the_trunk cd trunk svn merge --reintegrate ..... but I got: svn: Querying mergeinfo requires version 3 of the FSFS filesystem schema; filesystem '/nfs/sf-svn-symlinks/gramps/db' uses only version 1 This ticket: http://sourceforge.net/apps/trac/sourceforge/ticket/18867 seems to suggest the sourceforge repository should be upgraded. Is this correct, or should the --reintegrate work anyway? Does the suggested command in the wiki work? |