Re: [Rosegarden-user] svn to git Transition Complete
On 4/2/21 1:59 PM, Ted Felix wrote: The transition from svn to git is complete. For those that are following along with git for testing, I've confirmed that instead of this: git fetch --tags git rebase ...you can safely do this: git pull --tags A little bit easier to remember. For those using the development workflow, you can resync with these commands: git checkout master git status ...make sure you have a clean and up to date working copy and then... git pull --tags upstream master git push --tags origin master (Pull has caused me problems in the past, but it appears to have been the fault of a more primitive workflow.) I updated the "Using git" page on the wiki: https://www.rosegardenmusic.com/wiki/dev:using_git Ted. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
Thanks for testing. I just updated it to use git describe. Works well with only one git invocation. Could probably reduce it to just the hash and the * with string manipulation in cmake. Looks fine as-is, though, so I think I'll leave it alone. Please test latest git. Ted. On 4/6/21 4:43 PM, Colin Fletcher wrote: On 06/04/2021 20:48, Ted Felix wrote: Ok, shouldn't check for svn now. Please test latest in git. Yes, looks good. No complaints about missing svn executable from make now, and "About Rosegarden" shows the right commit hash (including a '*' at the end if there are any local uncommitted changes). I didn't use git describe, but it looks like I should. I'll take a closer look. Thanks for the tip. You're welcome. 'git describe' output is a bit more meaningful than just a commit hash: if all you want is a unique identifier it might not be necessary, but it is intended for exactly this kind of use. Cheers, Colin. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
On 06/04/2021 20:48, Ted Felix wrote: > Ok, shouldn't check for svn now. Please test latest in git. Yes, looks good. No complaints about missing svn executable from make now, and "About Rosegarden" shows the right commit hash (including a '*' at the end if there are any local uncommitted changes). > I didn't use git describe, but it looks like I should. I'll take a > closer look. Thanks for the tip. You're welcome. 'git describe' output is a bit more meaningful than just a commit hash: if all you want is a unique identifier it might not be necessary, but it is intended for exactly this kind of use. Cheers, Colin. OpenPGP_signature Description: OpenPGP digital signature ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
Ok, shouldn't check for svn now. Please test latest in git. I didn't use git describe, but it looks like I should. I'll take a closer look. Thanks for the tip. Ted. On 4/4/21 3:43 PM, Ted Felix wrote: Yeah, that's actually on my todo list to switch us over from svn to git in the about box. Does it still build ok? Ted. On 4/4/21 8:33 AM, Colin Fletcher wrote: On 02/04/2021 18:59, Ted Felix wrote: The transition from svn to git is complete. For those who are following along with development, you'll need to abandon your svn working copy and start a new git working copy. I've put together a "Using git" page on the wiki that describes how to use git for testing. Follow the steps in the "Testing Workflow" section and you should be back to following along with the latest updates. https://www.rosegardenmusic.com/wiki/dev:using_git Let me know if you run into any issues. I don't have subversion installed here (I've been using 'git svn' exclusively as svn client for a while), and I get this on a checkout of git://git.code.sf.net/p/rosegarden/git: colinf@colinf-xps15:~/src/rosegarden/build$ make [ 1%] Generating svn_header -- Could NOT find Subversion (missing: Subversion_SVN_EXECUTABLE) -- Build key 11dbb44a20 So something still expects to be able to get the svn revision: probably it should rather be using 'git describe' now. Cheers, Colin. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
hard drive most likely - I have seen some smartd errors on this machine. I have used https://github.com/tedfelix/rosegarden in the past with no problems. On 04/04/2021 11:59 pm, Ted Felix wrote: On 4/4/21 5:46 PM, chuck elliot wrote: I built it from git the other day. It compiled ok 2nd try. Good to hear. collect2: fatal error: ld terminated with signal 7 [Bus error], core dumped Wow. That's a crash like a sigsegv. Could be almost anything including cosmic rays or a marginal hard drive. Or just a bug in that version of the linker. BTW any idea why my installation doesn't take me to the [last_used_path] on 'open' and dialogue starts minimised? It's on my todo for when the git transition is complete. Still have a few things to do on the transition. Ted. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
On 04/04/2021 20:43, Ted Felix wrote: > Yeah, that's actually on my todo list to switch us over from svn to > git in the about box. Does it still build ok? Yes, after the "Could NOT find Subversion" message the build continues without further error, and appears to produce a working rosegarden binary. Cheers, Colin. OpenPGP_signature Description: OpenPGP digital signature ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
On 4/4/21 5:46 PM, chuck elliot wrote: I built it from git the other day. It compiled ok 2nd try. Good to hear. collect2: fatal error: ld terminated with signal 7 [Bus error], core dumped Wow. That's a crash like a sigsegv. Could be almost anything including cosmic rays or a marginal hard drive. Or just a bug in that version of the linker. BTW any idea why my installation doesn't take me to the [last_used_path] on 'open' and dialogue starts minimised? It's on my todo for when the git transition is complete. Still have a few things to do on the transition. Ted. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
I built it from git the other day. It compiled ok 2nd try. 1st try aborted with: [ 94%] Building CXX object src/CMakeFiles/rosegardenprivate.dir/sequencer/RosegardenSequencer.cpp.o [ 94%] Building CXX object src/CMakeFiles/rosegardenprivate.dir/sound/JackCaptureClient.cpp.o [ 94%] Building CXX object src/CMakeFiles/rosegardenprivate.dir/qrc_data.cpp.o [ 94%] Building CXX object src/CMakeFiles/rosegardenprivate.dir/qrc_locale.cpp.o [ 95%] Linking CXX shared library ../librosegardenprivate.so collect2: fatal error: ld terminated with signal 7 [Bus error], core dumped compilation terminated. make[2]: *** [src/CMakeFiles/rosegardenprivate.dir/build.make:11085: librosegardenprivate.so] Error 1 make[2]: *** Deleting file 'librosegardenprivate.so' make[1]: *** [CMakeFiles/Makefile2:261: src/CMakeFiles/rosegardenprivate.dir/all] Error 2 make: *** [Makefile:161: all] Error 2 BTW any idea why my installation doesn't take me to the [last_used_path] on 'open' and dialogue starts minimised? Thanks. On 04/04/2021 8:43 pm, Ted Felix wrote: Yeah, that's actually on my todo list to switch us over from svn to git in the about box. Does it still build ok? Ted. On 4/4/21 8:33 AM, Colin Fletcher wrote: On 02/04/2021 18:59, Ted Felix wrote: The transition from svn to git is complete. For those who are following along with development, you'll need to abandon your svn working copy and start a new git working copy. I've put together a "Using git" page on the wiki that describes how to use git for testing. Follow the steps in the "Testing Workflow" section and you should be back to following along with the latest updates. https://www.rosegardenmusic.com/wiki/dev:using_git Let me know if you run into any issues. I don't have subversion installed here (I've been using 'git svn' exclusively as svn client for a while), and I get this on a checkout of git://git.code.sf.net/p/rosegarden/git: colinf@colinf-xps15:~/src/rosegarden/build$ make [ 1%] Generating svn_header -- Could NOT find Subversion (missing: Subversion_SVN_EXECUTABLE) -- Build key 11dbb44a20 So something still expects to be able to get the svn revision: probably it should rather be using 'git describe' now. Cheers, Colin. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
Yeah, that's actually on my todo list to switch us over from svn to git in the about box. Does it still build ok? Ted. On 4/4/21 8:33 AM, Colin Fletcher wrote: On 02/04/2021 18:59, Ted Felix wrote: The transition from svn to git is complete. For those who are following along with development, you'll need to abandon your svn working copy and start a new git working copy. I've put together a "Using git" page on the wiki that describes how to use git for testing. Follow the steps in the "Testing Workflow" section and you should be back to following along with the latest updates. https://www.rosegardenmusic.com/wiki/dev:using_git Let me know if you run into any issues. I don't have subversion installed here (I've been using 'git svn' exclusively as svn client for a while), and I get this on a checkout of git://git.code.sf.net/p/rosegarden/git: colinf@colinf-xps15:~/src/rosegarden/build$ make [ 1%] Generating svn_header -- Could NOT find Subversion (missing: Subversion_SVN_EXECUTABLE) -- Build key 11dbb44a20 So something still expects to be able to get the svn revision: probably it should rather be using 'git describe' now. Cheers, Colin. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
Re: [Rosegarden-user] svn to git Transition Complete
On 02/04/2021 18:59, Ted Felix wrote: > The transition from svn to git is complete. > > For those who are following along with development, you'll need to > abandon your svn working copy and start a new git working copy. > > I've put together a "Using git" page on the wiki that describes how to > use git for testing. Follow the steps in the "Testing Workflow" section > and you should be back to following along with the latest updates. > > https://www.rosegardenmusic.com/wiki/dev:using_git > > Let me know if you run into any issues. I don't have subversion installed here (I've been using 'git svn' exclusively as svn client for a while), and I get this on a checkout of git://git.code.sf.net/p/rosegarden/git: colinf@colinf-xps15:~/src/rosegarden/build$ make [ 1%] Generating svn_header -- Could NOT find Subversion (missing: Subversion_SVN_EXECUTABLE) -- Build key 11dbb44a20 So something still expects to be able to get the svn revision: probably it should rather be using 'git describe' now. Cheers, Colin. OpenPGP_signature Description: OpenPGP digital signature ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
[Rosegarden-user] svn to git Transition Complete
The transition from svn to git is complete. For those who are following along with development, you'll need to abandon your svn working copy and start a new git working copy. I've put together a "Using git" page on the wiki that describes how to use git for testing. Follow the steps in the "Testing Workflow" section and you should be back to following along with the latest updates. https://www.rosegardenmusic.com/wiki/dev:using_git Let me know if you run into any issues. Ted. ___ Rosegarden-user mailing list Rosegarden-user@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-user
