Hi Chris, On Tue, Apr 28, 2020 at 5:58 PM Christopher Schultz < ch...@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Coty, > > On 4/28/20 10:45, Coty Sutherland wrote: > > > > > > On Tue, Apr 28, 2020 at 10:21 AM Christopher Schultz > > <ch...@christopherschultz.net > > <mailto:ch...@christopherschultz.net>> > wrote: > > > > Rémy, > > > > On 4/27/20 18:41, Rémy Maucherat wrote: > >> On Tue, Apr 28, 2020 at 12:21 AM Christopher Schultz > >> <ch...@christopherschultz.net > >> <mailto:ch...@christopherschultz.net> > >> <mailto:ch...@christopherschultz.net > > <mailto:ch...@christopherschultz.net>>> wrote: > > > >> All, > > > >> I tried again to commit to tc10 branch, got commit id > >> 8dddc11512fbd3b91ed9d737a42e4b8415458ddf. > > > >> Moving to tc9 branch: > > > >> $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf > >> fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf > > > >> - From tc10: > > > >> $ git remote -v origin https://github.com/apache/tomcat (fetch) > >> origin https://github.com/apache/tomcat (push) > > > >> - From tc9.0.x: > > > >> $ git remote -v origin https://github.com/apache/tomcat (fetch) > >> origin https://github.com/apache/tomcat (push) > > > >> My 9.0.x local is all up-to-date with github, and github can see > >> the commit in tc10. > > > >> Other than manually handing the diffs myself, I have no idea > >> what to do, next. :( > > > > > >>> I tried and it looked "ok" to me. > > > > Okay, what did you do? When I try to cherry-pick from 10 -> 9 I > > still get the "bad object" error. > > > > When cherry-picking your commits from 9.0.x -> 8.5.x, I get a > > merge-conflict (of course) because you have already merged them. > > > > Did I do something weird with the first commit? > > > > Maybe I don't have my branches in order? > > > > - From my tomcat-trunk (10) directory: > > > > $ git branch -a 9.0.x * master remotes/origin/7.0.x > > remotes/origin/8.5.x remotes/origin/9.0.x > > remotes/origin/BZ-63636/tomcat-8.5.x > > remotes/origin/BZ-63636/tomcat-9.0.x remotes/origin/BZ-63681/8.5.x > > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/8.5.x > > remotes/origin/BZ-63835/9.0.x remotes/origin/HEAD -> origin/master > > remotes/origin/master > > > > - From my tomcat-9.0.x directory: > > > > $ git branch -a * 9.0.x master remotes/origin/9.0.x > > > > - From my tomcat-8.5.x directory: > > > > $ git branch -a * 8.5.x remotes/origin/7.0.x remotes/origin/8.5.x > > remotes/origin/9.0.x remotes/origin/BZ-63681/8.5.x > > remotes/origin/BZ-63681/9.0.x remotes/origin/BZ-63835/9.0.x > > remotes/origin/HEAD -> origin/master remotes/origin/master > > > > My 9.0.x checkout seems "light". > > > > > >> Have you tried a `git fetch origin master` from your 9.0 dir? > >> That'll update the gitdb with new objects and refs from master, > >> which should include the one you're trying to pick. That's the > >> only thing I can think of given that you know your object ID is > >> correct and present in master on upstream :) > > That got 'er goin'! > > It definitely fetched a bunch of stuff, but no new files, etc. > (because becasue I was "up-to-date"). How can I be "up-to-date" > without being "up-to-date"? :( > I see these options for you: 1) don't use several directories for the different branches. Use just one and switch between branches: git checkout master / git checkout 9.0.x / git checkout 8.5.x 2) use https://git-scm.com/docs/git-worktree if you prefer to have separate folder for each branch > > Maybe now I can go back and merge the original commits from this > thread from February. > > - -chris > -----BEGIN PGP SIGNATURE----- > Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ > > iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6oRIAACgkQHPApP6U8 > pFhtsA/9HHIvXZSbOsJuiBSkc0mBLonbtnvu5SOGizvcHZwPymfQgv+SC4yxiam+ > oAXEcBOfXnFG+bdBeD80F16xQOXDOT1ndSwMASA2LzdG2iDqSVVD2DvoqX3Sna3N > +5Rp40GpIpctVLaz6rp/xTey9pZhFGy+qAjV6lssykU2Dm0trh8JNsWW4qd5Dd14 > RjLSVPN3fmxJ71hXJ3s5X8AufJmxi/TnMfC5h883WpyCM6Wsd1S7E4joXLPXt3LT > qt82OBCpG23TIAM3CWeBykuKtbpnQ7eSmvMUPiBf8mG/6YoiBoGwuswsZPpDnLj6 > 6j4ni9IjSbPbbt7n5DBFa+QDZ6huIWH5iKcrX27ytQxVDHgDK5J9evHaTK9DbdqW > xdFdpJ5q2swC+EhZmzz524jQWWcXsUIR0kABtT8MRlW33/5Q23m9ImBu9u58Ep+m > vGmg8wCezCXAybCYQ86yjVICIINCd4GErrqh5KPbzMfOmTrvi0CTiqiJl9bsLdXr > MpgbLlKzuaOswFVeI/KbfkKquWZedQVB9Ult2fDNtpRPuqxpjeyJAgu4gTtuwXy4 > +Mr+YFO9zaS49wxBo92L7ZqVn2tYPiMdzxj+39xMKwt5lj+76gq9Iyn7leKxrEZM > skqHJql7EgIwZ+xTVPlAdtERvbq6FkBHAnJxqAYDydkTVSC7CKY= > =9c6q > -----END PGP SIGNATURE----- > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
