Print

Print


Fabrice

I am not positive that this script does what we want,
because the commits that brought these big files have
the same SHA1 as the legitimate commits in qservTestdata,
you just pulled in these commits as far as I can tell.
I worry that undoing these commits will mess up qservTestdata
This sort of repairs are not well documented, and
are dangerous (and I am not a big expert on git...)

Jacek



On 04/23/2013 07:49 AM, Fabrice Jammes wrote:
> Jacek,
>
> Sorry again for this, will be more carefull in the future.
> There won't be anymore commit about tickets/2807 in
> dev.lsstcorp.org/LSST/DMS/qserv
> as it is stored in dev.lsstcorp.org/LSST/DMS/testdata/qservdata.git.
>
> Hope the "git-delete-history.sh" script i've sent you in previous mail
> will help.
>
> Fabrice
>
> On 04/23/2013 05:08 AM, Jacek Becla wrote:
>> Fabrice
>>
>> Oh no, this actually is not good at all. Last time it took
>> me several hours to untangle the bad commits, and I had to
>> consult with several people. This case is different from
>> the last one, because you pulled in changes from qservdata.git
>> into qserv.git, and what complicates things is that I am
>> offsite the next few days.
>>
>> Definitely do not commit or push anything related to this
>> ticket until it gets cleaned.
>>
>> Jacek
>>
>>
>>
>>
>> On 04/22/2013 08:08 AM, Fabrice Jammes wrote:
>>> Hello Jacek,
>>>
>>> Sorry but i've made a mistake while trying to push to qservdata :
>>>
>>> I've launched :
>>> git push ssh:[log in to unmask] tickets/2807
>>> instead of :
>>> git push ssh:[log in to unmask]
>>> tickets/2807
>>>
>>> (commit n° 5f3c6633db0807724380163244a52831e607c949)
>>>
>>> So a lot of useless test data are now in
>>> [log in to unmask]
>>>
>>> Could you please remove this ticket from
>>> [log in to unmask] repository ?
>>>
>>> I think that next commands should work, i've tried it successfully on a
>>> local git cloned repository :
>>>
>>>      $ git checkout tickets/2807
>>> # copy attached file git-delete-history.sh in git root repository and
>>> chow u+x
>>>      $ git-delete-history.sh *
>>>      $ git checkout master
>>>      $ git branch -D tickets/2807
>>>
>>> Yours sincerely,
>>>
>>> Fabrice
>>>
>>> ########################################################################
>>> Use REPLY-ALL to reply to list
>>>
>>> To unsubscribe from the QSERV-L list, click the following link:
>>> https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1
>>>
>>
>> ########################################################################
>> Use REPLY-ALL to reply to list
>>
>> To unsubscribe from the QSERV-L list, click the following link:
>> https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1
>

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1