From: Philippe C. <la-...@or...> - 2012-09-24 16:46:11
|
Hi Jonathan, since we now know that nickname location is correct for Pro 14, we can enable the set nickname function (additionally, I corrected some incorrect indentations). The first patch is similar to the ones applied for Pro 24 and 40. Best regards, Phil -- Philippe Carriere <la-...@or...> |
From: Jonathan W. <jw...@ju...> - 2012-09-25 06:19:06
|
Hi Phil > since we now know that nickname location is correct for Pro 14, we can > enable the set nickname function (additionally, I corrected some > incorrect indentations). > The first patch is similar to the ones applied for Pro 24 and 40. No problem. These have been applied as r2230 and r2231. At some point could you do an "svn update" to pull in the svn version of saffire_pro14.{cpp,h}? Your diffs involving these two files are showing up with a 1 line offset, most likely because your local copy doesn't include the copyright lines I added on your behalf. Regards jonathan |
From: Philippe C. <la-...@or...> - 2012-09-25 18:07:20
|
Le mardi 25 septembre 2012 à 15:48 +0930, Jonathan Woithe a écrit : > No problem. These have been applied as r2230 and r2231. > Thanks. > At some point could you do an "svn update" to pull in the svn version of > saffire_pro14.{cpp,h}? Your diffs involving these two files are showing up > with a 1 line offset, most likely because your local copy doesn't include > the copyright lines I added on your behalf. > Sorry. I use the git repository; so I have to learn how to update from svn. > Regards > jonathan Regards, Phil -- Philippe Carriere <la-...@or...> |
From: Jonathan W. <jw...@ju...> - 2012-09-26 01:44:43
|
Hi Phil > > At some point could you do an "svn update" to pull in the svn version of > > saffire_pro14.{cpp,h}? Your diffs involving these two files are showing up > > with a 1 line offset, most likely because your local copy doesn't include > > the copyright lines I added on your behalf. > > Sorry. I use the git repository; so I have to learn how to update from > svn. That's fine; at least in theory the git repo should sync up with svn and then allow you to sync with it. Now Adrian's done his resync thing again this may happen as a matter of course - all you should need to do is do the git equivalent of an "svn update" (which I think is "git pull" or something like it). Regards jonathan |
From: Philippe C. <la-...@or...> - 2012-09-26 06:31:10
|
Le mercredi 26 septembre 2012 à 11:14 +0930, Jonathan Woithe a écrit : > Hi Phil > Hi Jonathan, > That's fine; at least in theory the git repo should sync up with svn That was the point; the git repository was not synchronized at that moment. Adrian synchronized it yesterday and, of course, I then pulled the updates in my own. Now, such situations might be frequent, Adrian having his own constraints. So, I will have to read a little bit more doc to understand how to update from svn to git (up to now, I only know how to clone from svn into git) so as to be able to update my git either directly from Adrian'git when available or from the svn if necessary. Best regards, Phil -- Philippe Carriere <la-...@or...> |
From: Adrian K. <ad...@dr...> - 2012-09-26 07:26:24
|
On Wed, Sep 26, 2012 at 08:30:43AM +0200, Philippe Carriere wrote: > constraints. So, I will have to read a little bit more doc to understand > how to update from svn to git (up to now, I only know how to clone from > svn into git) so as to be able to update my git either directly from > Adrian'git when available or from the svn if necessary. Untested: You already have the git checkout. Edit your .git/config and add the following: [svn-remote "svn"] url = http://subversion.ffado.org/ffado rewriteRoot = svn+ssh://ffa...@ff.../ffado rewriteUUID = 2be59082-3212-0410-8809-b0798e1608f0 fetch = trunk:refs/remotes/trunk branches = branches/*:refs/remotes/* tags = tags/*:refs/remotes/tags/* This might be sufficient to do git svn rebase to pull in new svn commits. With git svn, the recommendation is to never work on master but only use it to track the remote svn. Real work is done on a branch that you rebase against master every time you ran git svn rebase. OTOH, you can also git svn rebase in this additional branch. HTH -- mail: ad...@th... http://adi.thur.de PGP/GPG: key via keyserver |
From: Philippe C. <la-...@or...> - 2012-09-27 20:54:54
|
Le mercredi 26 septembre 2012 à 09:26 +0200, Adrian Knoth a écrit : > You already have the git checkout. Edit your .git/config and add the > following: > > [svn-remote "svn"] > url = http://subversion.ffado.org/ffado > rewriteRoot = svn+ssh://ffa...@ff.../ffado > rewriteUUID = 2be59082-3212-0410-8809-b0798e1608f0 > fetch = trunk:refs/remotes/trunk > branches = branches/*:refs/remotes/* > tags = tags/*:refs/remotes/tags/* > > This might be sufficient to do > > git svn rebase > > Unfortunately, git svn rebase answered: Unable to determine upstream SVN information from working tree history Possibly, first cloning the subversion repository, then adding the information for the git one would work ? I will try something next days. > to pull in new svn commits. > > > With git svn, the recommendation is to never work on master but only use > it to track the remote svn. Real work is done on a branch that you > rebase against master every time you ran git svn rebase. OTOH, you can > also git svn rebase in this additional branch. Yet I work on a branch (or sometimes branches) and let master unchanged except by rebase. Best regards, Phil -- Philippe Carriere <la-...@or...> |
From: Adrian K. <ad...@dr...> - 2012-09-27 21:05:43
|
On 09/27/12 22:54, Philippe Carriere wrote: >> You already have the git checkout. Edit your .git/config and add the >> following: >> >> [svn-remote "svn"] >> url = http://subversion.ffado.org/ffado >> rewriteRoot = svn+ssh://ffa...@ff.../ffado >> rewriteUUID = 2be59082-3212-0410-8809-b0798e1608f0 >> fetch = trunk:refs/remotes/trunk >> branches = branches/*:refs/remotes/* >> tags = tags/*:refs/remotes/tags/* >> >> This might be sufficient to do >> >> git svn rebase >> >> > > Unfortunately, git svn rebase answered: > > Unable to determine upstream SVN information from working tree > history My bad, the svn tracking branches are missing on github. I'll have to clean up my local repo before pushing them. You can then fetch them, add the config and that's it. The basic procedure is described here: http://repo.or.cz/w/jack2.git/ You can also start from scratch and import the entire history. Described here: http://www.ardour.org/node/2098 Make sure to use rewriteRoot and rewriteUUID on your initial import, so our repositories stay compatible. Cheers |