Beagle git migration issue

View: New views
4 Messages — Rating Filter:   Alert me  

Beagle git migration issue

by Arun Raghavan-7 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hello All,
I'd spoken about this on #git, but just to keep some history on this:

I tried building Beagle from git and it complained about a missing
file. I diff'ed the svn and git trees and found that
beagle/beagled/Lucene.Net differed significantly (there are files that
are missing and extra files as well). You can see the 2 trees at:

http://svn.gnome.org/viewvc/beagle/trunk/beagle/beagled/Lucene.Net
http://git.gnome.org/cgit/beagle/tree/beagle/beagled/Lucene.Net

This particular file (which is also causing the build failure since it
doesn't exist in git), might be a good place to start looking:
http://svn.gnome.org/viewvc/beagle/trunk/beagle/beagled/Lucene.Net/Makefile.include?view=log

Here's what I suspect the problem is: there is a branch called
beagle-lucene2_1, which tracked the Lucene 2.1 import. The branch was
created from only the beagle/ directory, which is at the top-level of
the Beagle svn/git module. This was merged to trunk in the following
commit:

http://svn.gnome.org/viewvc/beagle?view=revision&revision=4577

I'm not sure how merge histories have been imported, but in this
history of the git 'master' branch, I only see commit '4577' which is
the merge commit, and none of the other commits in the
beagle-lucene2_1 branch which should have been merged along with the
branch.

Hope this makes sense, and helps.

Cheers,
Arun
_______________________________________________
Dashboard-hackers mailing list
Dashboard-hackers@...
http://mail.gnome.org/mailman/listinfo/dashboard-hackers

Re: Beagle git migration issue

by Arun Raghavan-7 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

'ola! :)

The git repo should be up again. Please give it a spin and let me
know. I'll try to build everything once in a while, and diff the 2
trees to make doubly sure.

Cheers,
Arun
_______________________________________________
Dashboard-hackers mailing list
Dashboard-hackers@...
http://mail.gnome.org/mailman/listinfo/dashboard-hackers

Re: Beagle git migration issue

by Joe Shaw-4 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hey,

On Fri, Apr 24, 2009 at 12:21 AM, Arun Raghavan <arunsr@...> wrote:
> The git repo should be up again. Please give it a spin and let me
> know. I'll try to build everything once in a while, and diff the 2
> trees to make doubly sure.

I am updating my Ubuntu to Jaunty so I can't test it at the moment,
but thanks for noticing this and getting it taken care of.

Joe
_______________________________________________
Dashboard-hackers mailing list
Dashboard-hackers@...
http://mail.gnome.org/mailman/listinfo/dashboard-hackers

Re: Beagle git migration issue

by Arun Raghavan-7 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

'ello!

The build seems fine, and the two trees also seem to be identical.
--
Arun Raghavan
(http://nemesis.accosted.net)
v2sw5Chw4+5ln4pr6$OFck2ma4+9u8w3+1!m?l7+9GSCKi056
e6+9i4b8/9HTAen4+5g4/8APa2Xs8r1/2p5-8 hackerkey.com
_______________________________________________
Dashboard-hackers mailing list
Dashboard-hackers@...
http://mail.gnome.org/mailman/listinfo/dashboard-hackers