Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [udig-devel] gitourous hates us :-P
When you get to work this morning lets make a plan.

I expect that:
1. we rename udig-platform-fixed
2. we ask people to make their cloned repositories on gitourious again; so they can submit merge requests again

Anything I am missing? Should we ask support@xxxxxxxxxxxxx to clean up the previous mess or can we just delete it? 
-- 
Jody Garnett

On Wednesday, 16 February 2011 at 11:58 PM, Jesse Eichar wrote:

Hi

I have truncated the repository history to the commit after the broken missing commit and created a repository in gitorious called udig-platform-fixed.  (URL is http://gitorious.org/udig/udig-platform-fixed).   I have updated to the latest git and cloned that repo using all three protocols and they all work fine.  (At least for me).  

I have also renamed the corrupt udig repo to udig-platform-corrupt and added a warning.  If udig-platform-fixed works for others as well then we should rename it to udig-platform and use that.  

If we do renamed udig-platform-fixed you will not be able to update and existing repository, a full checkout is required because I had to write the history in order to get rid of the bad commits.  I image there was probably a better way but I am not yet enough of a git expert to do it.


Comments welcome,
Jesse



On Wed, Feb 16, 2011 at 10:56 AM, Jesse Eichar <jesse.eichar@xxxxxxxxxxxxxx> wrote:
I have tracked as being caused by an old version of egit.  Apparently egit used to corrupt git repositories.  I have an old version of the repo I think that might not have the corruption.  I am going to try to merge the two somehow.

Jesse


On Wed, Feb 16, 2011 at 9:21 AM, andrea antonello <andrea.antonello@xxxxxxxxx> wrote:
If someone is in need to clone right now, he can do that on my clone:
http://gitorious.org/~moovida/udig/moovidas-udig-platform

I checked and it works. Currently my clone is in sync with the main one.

Andrea


On Wed, Feb 16, 2011 at 9:16 AM, Jody Garnett <jody.garnett@xxxxxxxxx> wrote:
> Should it be preventing others from performing git clone?
>
> --
> Jody Garnett
>
> On Wednesday, 16 February 2011 at 5:22 PM, Jesse Eichar wrote:
>
> I have noticed the dangling commit as well and want to find the time to fix
> that.  Perhaps I can spend some time this week as well
>
> On Wed, Feb 16, 2011 at 5:10 AM, Jody Garnett <jody.garnett@xxxxxxxxx>
> wrote:
>>
>> One thing I was able to do is (as a workaround):
>> git clone git@xxxxxxxxxxxxx:udig/udig-platform.git --depth 2
>> This produces a copy of the code base; allowing patches to be created (but
>> is not sufficient to push a change up to a remote repository as I understand
>> it).
>> --
>> Jody Garnett
>>
>> On Wednesday, 16 February 2011 at 12:55 PM, Jody Garnett wrote:
>>
>> So we are left with the advice here:
>>
>> - http://stackoverflow.com/questions/746684/how-to-search-through-all-commits-in-the-repository
>> We are however not in a position to push up the origional repository again
>> as refractions pulled the svn plug. Jesse do you have
>> your old git repository?
>>
>> --
>> Jody Garnett
>>
>> On Wednesday, 16 February 2011 at 12:41 PM, Jody Garnett wrote:
>>
>> Looking a bit more and the timeframe in git log indicates that this is
>> part of the svn history:
>>
>> commit 125243d998563097fe6f12324f213827be3e2a21
>> Author: Jody Garnett <Jody.Garnett@xxxxxxxxxxxx>
>> Date:   Wed Apr 7 13:28:26 2010 +0000
>>     working on generic geotools datastore support
>>
>>     git-svn-id: http://svn.refractions.net/udig/udig/trunk@31662
>> e5c1c795-43da-0310-a71f-fac65c449510
>> commit 328f7b99410d7a40232e968017c10c30392994bc
>> Author: jgarnett <jgarnett@e5c1c795-43da-0310-a71f-fac65c449510>
>> Date:   Wed Apr 7 02:23:05 2010 +0000
>>     Move Up and Move Down commands; done as undoable commands etc...
>>
>>     git-svn-id: http://svn.refractions.net/udig/udig/trunk@31661
>> e5c1c795-43da-0310-a71f-fac65c449510
>> error: Could not read 0d3075533cc3a09b773ec6600c16e7e11800b7de
>> fatal: Failed to traverse parents of commit
>> 98f24347e1ae065ae236fe04e0ce1971c91c596a
>>
>> Translated to gitourous links we have:
>>
>> - http://gitorious.org/udig/udig-platform/commit/125243d998563097fe6f12324f213827be3e2a21
>>
>> - http://gitorious.org/udig/udig-platform/commit/328f7b99410d7a40232e968017c10c30392994bc
>>
>> - http://gitorious.org/udig/udig-platform/commit/0d3075533cc3a09b773ec6600c16e7e11800b7de
>> (broken)
>> What is interesting if I look at the message it indicates "failed to
>> traverse parents", looking at the number gives:
>>
>> - http://gitorious.org/udig/udig-platform/commit/98f24347e1ae065ae236fe04e0ce1971c91c596a
>> Can we learn anything from this? So for IRC has been useless for
>> gitourous.
>>
>> --
>> Jody Garnett
>>
>> On Wednesday, 16 February 2011 at 11:57 AM, Jody Garnett wrote:
>>
>> Chasing down the other lead JGit/Egit having a bug and not push the file
>> up.
>> - http://help.github.com/egit-corruption/
>> Has instructions for the user that made the commit to follow; to push the
>> change up from the command line.
>> This idea is backed up from other sources (as a common way to create the
>> "missing commit" problem):
>> - http://support.github.com/discussions/repos/4443-repo-corruption
>> --
>> Jody Garnett
>>
>> On Wednesday, 16 February 2011 at 11:52 AM, Jody Garnett wrote:
>>
>> Okay searching for this shows JGit/Egit as a suspect:
>>
>> - http://stackoverflow.com/questions/1507463/how-to-deal-with-this-git-error
>> - http://osdir.com/ml/git/2009-08/msg01219.html
>> And some advice on how to recover:
>>
>> - http://stackoverflow.com/questions/801577/how-to-recover-git-objects-damaged-by-hard-disk-failure
>>
>> - http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/
>> Can I ask people to run git fsck --full on their local clone? Git
>> cherry-pick may be of use if we can find someone with the commit in
>> uncorrupted form?
>> --
>> Jody Garnett
>>
>> On Wednesday, 16 February 2011 at 11:44 AM, Jody Garnett wrote:
>>
>> Okay on the advice of one of the threads I tried fsck --full
>>
>> Enoli:platform jody$ git fsck --full
>> broken link from  commit 98f24347e1ae065ae236fe04e0ce1971c91c596a
>>               to  commit 0d3075533cc3a09b773ec6600c16e7e11800b7de
>> dangling commit 440e1954db7fc6bfa27ffcfae1f331af59e70f11
>> missing commit 0d3075533cc3a09b773ec6600c16e7e11800b7de
>>
>> This is the same "missing commit" that is preventing git log and clone
>> from working
>>
>> 0d3075533cc3a09b773ec6600c16e7e11800b7de
>>
>>  Perhaps if we search for missing commit we can get somewhere?
>>
>>
>>
>>
>>
>
>
>
> _______________________________________________
> User-friendly Desktop Internet GIS (uDig)
> http://udig.refractions.net
> http://lists.refractions.net/mailman/listinfo/udig-devel
>
>
_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel


_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel

Back to the top