You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tika.apache.org by Tilman Hausherr <TH...@t-online.de> on 2020/12/14 05:51:07 UTC
accidental merge
Hi all,
I made an accidental merge and I tried to revert it, but I suspect I
made it worse. Still working on it...
Tilman
Re: accidental merge
Posted by Peter Lee <pe...@apache.org>.
> That one (0810700) I wanted to commit.
>
I see. Everything looks good now. :)
Lee
On 12 14 2020, at 4:35, Tilman Hausherr <TH...@t-online.de> wrote:
> Am 14.12.2020 um 08:48 schrieb Peter Lee:
> > Seems the latest commit 7f65d61 is exactly the same as dd85c73:
> > https://github.com/apache/tika/compare/dd85c73..7f65d61 (https://github.com/apache/tika/compare/3571725..7f65d61)
> > https://github.com/apache/tika/compare/3571725..7f65d61
> > which means the commit 0810700 is not reverted yet.
>
>
> That one (0810700) I wanted to commit.
> My mistake is that I hadn't pulled all the changes before making the
> commit. Things then got bad.
>
> The next commit was apparently made implicitly after I had pushed the
> changes. I thought that I had reverted your changes but now I suspect
> that it had repeated your changes, but maybe an earlier point in (my?)
> history.
>
> Tilman
> > The 10 lines commits is not a big change. Maybe just modify them without using git revert is a good idea?
> > BTW we can use "git pull --rebase" to update local repo, then we can avoid the merge commit
> > cheers,
> > Lee
> > On 12 14 2020, at 2:08, Tilman Hausherr <TH...@t-online.de> wrote:
> >> I think I got it now.
> >>
> >> Someone please verify this:
> >> the last good commit is from Peter Lee "Simplify init code of some Set
> >> and List".
> >> then I made a small commit "TIKA-3248: avoid ClassCastException" of
> >> about 10 lines.
> >>
> >> then "bad" things happened.
> >> Ideally, the last three commits on top shouldn't have happened.
> >> Tilman
> >> Am 14.12.2020 um 06:51 schrieb Tilman Hausherr:
> >>> Hi all,
> >>>
> >>> I made an accidental merge and I tried to revert it, but I suspect I
> >>> made it worse. Still working on it...
> >>>
> >>> Tilman
> >>>
> >
>
Re: accidental merge
Posted by Tilman Hausherr <TH...@t-online.de>.
Am 14.12.2020 um 08:48 schrieb Peter Lee:
> Seems the latest commit 7f65d61 is exactly the same as dd85c73:
> https://github.com/apache/tika/compare/dd85c73..7f65d61 (https://github.com/apache/tika/compare/3571725..7f65d61)
> https://github.com/apache/tika/compare/3571725..7f65d61
> which means the commit 0810700 is not reverted yet.
That one (0810700) I wanted to commit.
My mistake is that I hadn't pulled all the changes before making the
commit. Things then got bad.
The next commit was apparently made implicitly after I had pushed the
changes. I thought that I had reverted your changes but now I suspect
that it had repeated your changes, but maybe an earlier point in (my?)
history.
Tilman
> The 10 lines commits is not a big change. Maybe just modify them without using git revert is a good idea?
> BTW we can use "git pull --rebase" to update local repo, then we can avoid the merge commit
> cheers,
> Lee
> On 12 14 2020, at 2:08, Tilman Hausherr <TH...@t-online.de> wrote:
>> I think I got it now.
>>
>> Someone please verify this:
>> the last good commit is from Peter Lee "Simplify init code of some Set
>> and List".
>> then I made a small commit "TIKA-3248: avoid ClassCastException" of
>> about 10 lines.
>>
>> then "bad" things happened.
>> Ideally, the last three commits on top shouldn't have happened.
>> Tilman
>> Am 14.12.2020 um 06:51 schrieb Tilman Hausherr:
>>> Hi all,
>>>
>>> I made an accidental merge and I tried to revert it, but I suspect I
>>> made it worse. Still working on it...
>>>
>>> Tilman
>>>
>
Re: accidental merge
Posted by Peter Lee <pe...@apache.org>.
Seems the latest commit 7f65d61 is exactly the same as dd85c73:
https://github.com/apache/tika/compare/dd85c73..7f65d61 (https://github.com/apache/tika/compare/3571725..7f65d61)
https://github.com/apache/tika/compare/3571725..7f65d61
which means the commit 0810700 is not reverted yet.
The 10 lines commits is not a big change. Maybe just modify them without using git revert is a good idea?
BTW we can use "git pull --rebase" to update local repo, then we can avoid the merge commit
cheers,
Lee
On 12 14 2020, at 2:08, Tilman Hausherr <TH...@t-online.de> wrote:
> I think I got it now.
>
> Someone please verify this:
> the last good commit is from Peter Lee "Simplify init code of some Set
> and List".
> then I made a small commit "TIKA-3248: avoid ClassCastException" of
> about 10 lines.
>
> then "bad" things happened.
> Ideally, the last three commits on top shouldn't have happened.
> Tilman
> Am 14.12.2020 um 06:51 schrieb Tilman Hausherr:
> > Hi all,
> >
> > I made an accidental merge and I tried to revert it, but I suspect I
> > made it worse. Still working on it...
> >
> > Tilman
> >
>
Re: accidental merge
Posted by Tilman Hausherr <TH...@t-online.de>.
I think I got it now.
Someone please verify this:
the last good commit is from Peter Lee "Simplify init code of some Set
and List".
then I made a small commit "TIKA-3248: avoid ClassCastException" of
about 10 lines.
then "bad" things happened.
Ideally, the last three commits on top shouldn't have happened.
Tilman
Am 14.12.2020 um 06:51 schrieb Tilman Hausherr:
> Hi all,
>
> I made an accidental merge and I tried to revert it, but I suspect I
> made it worse. Still working on it...
>
> Tilman
>