Hopefully you meant NO stress on him, we dont want him stressed out :D On Fri, 24 Mar 2023 at 00:08, Rocky Bernstein <ro...@gnu.org> wrote:
> On Thu, Mar 23, 2023 at 5:13 PM Thomas Schmitt <scdbac...@gmx.net> wrote: > > > Hi, > > > > Rocky Bernstein wrote: > > > I was thinking that Pete would do the merge since he also has commit > > rights > > > after the two of you decide that it is time to merge > > > > Everybody is more qualified as git admin than i am. > > > > > > Pete Batard wrote: > > > Actually I don't mind if you guys sort it out as last time I checked (a > > > couple years ago), I had lost my ssh access right (which means that > right > > > now I'm just using https to clone the repo) and I'm a bit busy with > other > > > stuff ATM. > > > > This explains why you sent patches instead of preparing branches. > > > > So somebody must tell me what to do exactly for merging. > > (I read man git-merge but would prefer to succeed on the first try.) > > > > Here is an command-line example of what might be done: > > $ cd libcdio # or wherever you have libcdio checked out > $ git checkout master > Already on 'master' > Your branch is up to date with 'origin/master'. > $ git pull > Already up to date. > $ git merge fdd76a8ee4f4f00f1eabc6f632322db800ee9970 > Updating 6f2426e8..fdd76a8e > Fast-forward > include/cdio/rock.h | 20 ++++++++++---------- > lib/iso9660/rock.c | 98 > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- > 2 files changed, 71 insertions(+), 47 deletions(-) > $ # Run some tests and check over the Rockridge patches > $ git merge 569c452f8d1650c0ec50ebeef7869b54ed9c8be6 > hint: Waiting for your editor to close the file... > Waiting for Emacs... > # Here I was put in $EDITOR (GNU Emacs) and I entered the comment: > # Explicit initialization of tm_temp_tmp > Merge made by the 'ort' strategy. > lib/iso9660/iso9660.c | 2 +- > > # Do more tests here > > $ git status > On branch master > Your branch is ahead of 'origin/master' by 4 commits. > (use "git push" to publish your local commits) > > $ # The below is the last step which I have not done... > $ # git push > > Thomas - I encourage you to do the same, but do the tests and checks at the > appropriate places. > > There is no way you can mess up in git, because history is saved by default > for *everyone. *And specifically I have a copy. > > And if you want to set up a video conference or chat I am also happy to > look over your shoulder and explain anything that might be a mystery. > > In other words, this is supposed to be a stress on you, we want you to > succeed. > > But on the other hand if you want me to do this, I am also okay with that. > But I will redo with the missing testing steps, > which I am not as proficient at. Here - either of you are probably better > than :-) > > > > > > > > Rocky Bernstein wrote: > > > Ok. Just give me the SHA1 of the code that you'd like to see in master > > and > > > I will test it as well. And assuming everything works and it looks like > > > what has been mentioned here, I will merge it and let everyone know. > > > > Or that way. :)) > > > > The two branches "pete_batard_ce_v3" and "pete_batard_gcc_warnings" > > differ from "master" only by the three patches from Pete. > > pete_batard_ce_v3: > > commit 7896babce4a3fe3f27e733e4df3727f1e917bfd6 > > "Clean up rock.h and fix the use of char arrays in iso_su_ce_s" > > commit fdd76a8ee4f4f00f1eabc6f632322db800ee9970 > > "Add processing of Rock Ridge CE records" > > pete_batard_gcc_warnings: > > commit 569c452f8d1650c0ec50ebeef7869b54ed9c8be6 > > "Fix gcc warnings" > > Taken from git log of each branch. > > > > > > Next i will try to find out what's up with "joliet_multi_extent". > > > > > > Have a nice day :) > > > > Thomas > > > > > > >
