From: Lucas H. <lu...@di...> - 2007-07-20 14:39:30
|
I've migrated quite a few of the applications from svn to git. Version 1.5.3 of git has made this pretty easy to do. http://git.die.net.au/cgit I'll have to go through and manually tag release commits, I've done this for Pager. You can get the git repository for Pager at git://die.net.au/rox-git/Pager -- Lucas Hazel <lu...@di...> ================================================= "Clothes make the man. Naked men are rarely taken seriously, or given employment." ================================================= |
From: Tony H. <h...@re...> - 2007-07-20 14:46:37
|
In <20070721003637.138968c4@akira.digitilocal>, Lucas Hazel wrote: > I've migrated quite a few of the applications from svn to git. Version > 1.5.3 of git has made this pretty easy to do. > > http://git.die.net.au/cgit > > I'll have to go through and manually tag release commits, I've done > this for Pager. > > You can get the git repository for Pager at > > git://die.net.au/rox-git/Pager Unfortunately I haven't started using git yet and I've just made some changes to Pager using svn. Can you update the git repository with them? The svn is now at revision 5108. -- TH * http://www.realh.co.uk |
From: Lucas H. <lu...@di...> - 2007-07-20 22:10:52
|
On Fri, 20 Jul 2007 15:46:23 +0100 Tony Houghton <h...@re...> wrote: > In <20070721003637.138968c4@akira.digitilocal>, Lucas Hazel wrote: > > > I've migrated quite a few of the applications from svn to git. > > Version 1.5.3 of git has made this pretty easy to do. > > > > http://git.die.net.au/cgit > > > > I'll have to go through and manually tag release commits, I've done > > this for Pager. > > > > You can get the git repository for Pager at > > > > git://die.net.au/rox-git/Pager > > Unfortunately I haven't started using git yet and I've just made some > changes to Pager using svn. Can you update the git repository with > them? The svn is now at revision 5108. > OK, done. -- Lucas Hazel <lu...@di...> Digit Illogic Enterises [http://die.net.au] [phone: +61401313870] [ABN: 52841332786] AMAC Fast Track Computers Technician 209 Beardy Street, Armidale NSW [phone: +61267711287] School of Maths and Computer Science University of New England Armidale, Australia [http://cs.une.edu.au] ================================================= "Clothes make the man. Naked men are rarely taken seriously, or given employment." ================================================= |
From: Lucas H. <lu...@di...> - 2007-07-21 04:50:03
|
On Sat, 21 Jul 2007 00:36:37 +1000 Lucas Hazel <lu...@di...> wrote: > > I've migrated quite a few of the applications from svn to git. Version > 1.5.3 of git has made this pretty easy to do. > > http://git.die.net.au/cgit > > I'll have to go through and manually tag release commits, I've done > this for Pager. > > You can get the git repository for Pager at > > git://die.net.au/rox-git/Pager > I've managed to put together a ROX-Lib2 git repository. This was a bit more difficult as the code was moved from /ROX-Lib2 to /rox-lib/ROX-Lib2 and the --subdirectory-filter mechanism with git-filter-branch does not work in this case. This is what I had to do. Filter the original location, however the last commit removed all the files so I had to specify a rev list that did not include the last commit (including this commit will cause the filter to fail). $ git-filter-branch --subdirectory-filter ROX-Lib2 \ --msg-filter '~/bin/msgfilter.py -' \ rox-lib-old LAST_COMMIT_ID^ -- ROX-Lib2 Filter the new location into a branch. $ git-filter-branch --subdirectory-filter rox-lib/ROX-Lib2 \ --msg-filter '~/bin/msgfilter.py -' \ rox-lib-new Graft the new branch onto the old branch. This involved looking at the logs to get the commit ids. $ echo NEW_BRANCH_TAIL OLD_BRANCH_HEAD >> .git/info/grafts Then pull the resulting tree into a new Repository $ mkdir ROX-Lib2 $ cd ROX-Lib2 $ git init-db $ git pull PATH_TO_MASTER_REPO rox-lib-new Of course this method does not add tags, however I've found that checking the diff history of AppInfo.xml clearly indicates release milestones. -- Lucas Hazel <lu...@di...> ================================================= "Clothes make the man. Naked men are rarely taken seriously, or given employment." ================================================= |
From: Thomas L. <ta...@gm...> - 2007-07-21 07:51:31
|
On 7/21/07, Lucas Hazel <lu...@di...> wrote: [...] > I've managed to put together a ROX-Lib2 git repository. This was a bit > more difficult as the code was moved from /ROX-Lib2 > to /rox-lib/ROX-Lib2 and the --subdirectory-filter mechanism with > git-filter-branch does not work in this case. Interesting. I think my mistake with the filer was in trying to use git-svnimport. Despite what the manual says, it appears that 'git-svn' is always the right tool to use! BTW, you can use the git-svn comment format. I only patched it for rox-filer to match the git-svnimport syntax, since I'd used that for the rest of it. > Of course this method does not add tags, however I've found that > checking the diff history of AppInfo.xml clearly indicates release > milestones. Be careful - the appinfo change usually represents the *start* of release testing. There will often be a few commits after it fixing problems. (hopefully git will make this cleaner, since I can just modify the commit during testing until I'm happy and then push the one good commit to the public repository) -- Dr Thomas Leonard http://rox.sourceforge.net GPG: 9242 9807 C985 3C07 44A6 8B9A AE07 8280 59A5 3CC1 |
From: Lucas H. <lu...@di...> - 2007-07-21 08:37:04
|
On Sat, 21 Jul 2007 08:51:26 +0100 "Thomas Leonard" <ta...@gm...> wrote: > Be careful - the appinfo change usually represents the *start* of > release testing. There will often be a few commits after it fixing > problems. > > (hopefully git will make this cleaner, since I can just modify the > commit during testing until I'm happy and then push the one good > commit to the public repository) It was for this reason I haven't gone the whole hog and tagged everything. In the case of Pager I just tagged commits that indicated it was a release rather than a bump of the version in AppInfo.xml However, retagging in git is really quite easy as the tag just points to a commit id. Also, the ROX-Lib2 conversion didn't work correctly. In my rox-svn repository the history flows correctly, but when I try to pull it into the new repo the old history is lost. While I'm at it I'll apply a commit filter to my repos to fix the emails. Thanks. -- Lucas Hazel <lu...@di...> ================================================= "Clothes make the man. Naked men are rarely taken seriously, or given employment." ================================================= |
From: Lucas H. <lu...@di...> - 2007-07-21 08:40:40
|
On Sat, 21 Jul 2007 18:34:10 +1000 Lucas Hazel <lu...@di...> wrote: > Also, the ROX-Lib2 conversion didn't work correctly. In my rox-svn > repository the history flows correctly, but when I try to pull it into > the new repo the old history is lost. Hmm, seems to be working now... *shrug* -- Lucas Hazel <lu...@di...> ================================================= "Clothes make the man. Naked men are rarely taken seriously, or given employment." ================================================= |