Bug #114441 review
Hey team, I just wanted to know what is the status of my commit and what should I do next? Here is the link to the that bug commit-- https://gerrit.libreoffice.org/#/c/66203/3 Regards, Komal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Commit 66203
Hey Eike, Thanks alot for the help. So, I think I have done the required changes. Can you please check and suggest me what is to be done next? Regards, Komal On Jan 23, 2019 7:32 PM, "Eike Rathke" wrote: > Hi Komal, > > On Wednesday, 2019-01-23 14:48:18 +0100, Eike Rathke wrote: > > > You somehow have multiple changes on the branch you want to push to > > gerrit. > > Also, for the future (but get your change merge corrected and pushed > first) I recommend to use git-review to handle branches and changes to > be pushed to gerrit, which among other things exactly warns of multiple > changes to be pushed. See > https://wiki.documentfoundation.org/Development/GitReview > > Eike > > -- > GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 > 2D3A > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Commit 66203
Hey Eike, I still have lot many problems. I doesn't allow me to commit. komal@komal-Vostro-15-3568:~/Downloads/libo$ ./logerrit submit master Enumerating objects: 15, done. Counting objects: 100% (15/15), done. Delta compression using up to 4 threads Compressing objects: 100% (11/11), done. Writing objects: 100% (11/11), 1.19 KiB | 174.00 KiB/s, done. Total 11 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD -> refs/for/master (change https://gerrit.libreoffice.org/65890 closed) error: failed to push some refs to 'ssh://logerrit/core' * I also tried rebase on this link- https://gerrit.libreoffice.org/#/c/66203/. But it shows this error- The change could not be rebased due to a conflict during merge. The problem is I haven't done any changes but now I want to resolve this *Cannot . Merge* issue given on the link. After *git cherry-pick --continue, *what should I do? Because I did ./logerrit submit master, as shown above. But it has errors. I have tried almost every possible to commit, but nothing works. Please help! I will be really grateful for your help. Regards, Komal On Mon, Jan 21, 2019 at 8:58 PM Eike Rathke wrote: > Hi Komal, > > On Sunday, 2019-01-20 11:25:58 +0530, Komal Bharadiya wrote: > > > I followed the steps you suggested. I am on the local branch of the > > repository. > > [...] > > komal@komal-Vostro-15-3568:~/Downloads/libo$ git fetch > > https://git.libreoffice.org/core refs/changes/03/66203/2 && git > cherry-pick FETCH_HEAD > > [...] > > On branch my_first1 > > [...] > > no changes added to commit > > The previous cherry-pick is now empty, possibly due to conflict > resolution. > > If you wish to commit it anyway, use: > > > > git commit --allow-empty > > > > Otherwise, please use 'git reset' > > > _ > > komal@komal-Vostro-15-3568:~/Downloads/libo$ git cherry-pick --continue > > On branch my_first1 > > [...] > > no changes added to commit > > The previous cherry-pick is now empty, possibly due to conflict > resolution. > > [...] > > I deduce that you are on a local branch that still contains the commit > you submitted as change 66203 to gerrit. That's fine, you're almost > there ;-) > > You can then skip the cherry-pick from gerrit because, as git says, it > would result in an empty commit as there are no changes. > > You need to do the second step I mentioned to rebase to current master > then: > > > > issue the commands > > > > > > git fetch > > > git rebase origin/master > > and resolve the merge conflicts and proceed as described earlier in my > previous mail. > > Eike > > -- > GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 > 2D3A > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Commit 66203
Hey Eike, Thank you so much for the help! I followed the steps you suggested. I am on the local branch of the repository. After the * git rebase origin/master step, *I get all this on the terminal. komal@komal-Vostro-15-3568:~/Downloads/libo$ git fetch https://git.libreoffice.org/core refs/changes/03/66203/2 && git cherry-pick FETCH_HEAD >From https://git.libreoffice.org/core * branch refs/changes/03/66203/2 -> FETCH_HEAD Performing inexact rename detection: 100% (35178/35178), done. On branch my_first1 You are currently cherry-picking commit 40c717b6d00a. Changes not staged for commit: modified: helpcontent2 (new commits) Untracked files: 0001-simplify-ScChangeTrack-queues.patch It took 15.61 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself (see 'git help status'). no changes added to commit The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git reset' _ komal@komal-Vostro-15-3568:~/Downloads/libo$ git cherry-pick --continue On branch my_first1 You are currently cherry-picking commit 40c717b6d00a. Changes not staged for commit: modified: helpcontent2 (new commits) Untracked files: 0001-simplify-ScChangeTrack-queues.patch no changes added to commit The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git reset' ___ komal@komal-Vostro-15-3568:~/Downloads/libo$ git commit --allow-empty [my_first1 94f5fecef1fe] tdf#114441 Change in the Data Type to Sal_uInt32 Date: Sat Jan 12 08:16:18 2019 +0530 * I don't understand what to do next. But I want to submit my first commit. Please help! I also tried * ./logerrit submit master. *But I get this! :/ * komal@komal-Vostro-15-3568:~/Downloads/libo$ ./logerrit submit master Enumerating objects: 15, done. Counting objects: 100% (15/15), done. Delta compression using up to 4 threads Compressing objects: 100% (11/11), done. Writing objects: 100% (11/11), 1.22 KiB | 208.00 KiB/s, done. Total 11 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD -> refs/for/master (change https://gerrit.libreoffice.org/65890 closed) error: failed to push some refs to 'ssh://logerrit/core' * Link to my commit--- https://gerrit.libreoffice.org/#/c/66203/ Thanking you in anticipation! Regards, Komal On Sat, Jan 19, 2019 at 3:42 AM Eike Rathke wrote: > Hi Komal, > > On Friday, 2019-01-18 08:31:53 +0530, Komal Bharadiya wrote: > > > I have been working on my first commit. But I am not able to rework on my > > patch. > > I get this on my terminal-- > > > > > To ssh://logerrit:29418/core > > ! [remote rejected] HEAD -> refs/publish/master/66203 (you are > > not allowed to upload merges) > > error: failed to push some refs to 'ssh://komalbharadiya@logerrit > > :29418/core' > > > * > > Please help, how do I resolve *CANNOT MERGE* issue? > > It could had helped if you described exactly how you manoeuvred yourself > into that situation, i.e. which sequence of commands lead to a merge > commit that can't be pushed. Anyway.. > > First put aside (just in case your existing conflict resolution could be > reused or would come handy when resolving the merge conflict again) and > throw away your current commit(s); assuming that you are on your local > master do > > git log > > Your conflict resolution probably is the second commit and the HEAD > commit is the merge commit. If so, then > > git format-patch -1 HEAD~1 > > which writes some 0001-your-commit-summary.patch file. Then > > git reset --hard HEAD~2 >
Commit 66203
Hey team, I have been working on my first commit. But I am not able to rework on my patch. I get this on my terminal-- To ssh://logerrit:29418/core ! [remote rejected] HEAD -> refs/publish/master/66203 (you are not allowed to upload merges) error: failed to push some refs to 'ssh://komalbharadiya@logerrit :29418/core' * Please help, how do I resolve *CANNOT MERGE* issue? I have tried all possible means. But still couldnt resolve this. :/ https://gerrit.libreoffice.org/#/c/66203/ Thanking you in anticipation! Regards, Komal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem in running make file on Ubuntu 16.04
Thanks, I'll check it out. On Jan 8, 2019 1:44 PM, "Kaganski Mike" wrote: > On 08.01.2019 10:44, Komal Bharadiya wrote: > > I have been trying to setup libreoffice dev-environment lately. After > > executing ./autogen.sh file, I hit make command. The execution takes > > ample amount of time. It hangs my laptop, and I end up switching it off. > > I have tried multiple no. of times. But couldn't run it successfully, > > what can I do? Please help! > > I have Dell Vostro 3568 model. > > Thanking you in anticipation! > > https://wiki.documentfoundation.org/Development/BuildingOnLinux# > Performance > > > > Building LibreOffice takes time, a lot of time. Exactly how much depends > on how powerful your machine is > > Several lines below, there's "Approximate times" section, telling > someone's experience with some unspecified repo revision, which took 1.5 > hrs. I can tell you that I used to have ~8 hrs build time on Kaveri 7700 > box with spinning HDD. > > You should expect long build times on your laptop. But if you also are > going to do other tasks on it during the build (to increase build times > even more), then you may adjust it using --with-parallelism (discussed > there), which defaults to use all your cores, but which you could want > to set to a lower value to free some resources; or you may run make > using nice (`nice make`) to decrease its priority and make system > responsive to interaction without sacrificing cores. > > -- > Best regards, > Mike Kaganski > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem in running make file on Ubuntu 16.04
Hii Team, I have been trying to setup libreoffice dev-environment lately. After executing ./autogen.sh file, I hit make command. The execution takes ample amount of time. It hangs my laptop, and I end up switching it off. I have tried multiple no. of times. But couldn't run it successfully, what can I do? Please help! I have Dell Vostro 3568 model. Thanking you in anticipation! Regards, Komal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Komal Bharadiya license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
#Bug 114441
Hello Team, I am Komal. I am novice to open source. But really interested to learn and contribute for this organization. I went through #Bug 114441 [1] description and I made changes to one of the file ./sw/inc/pvprtdat.hxx. But I was confused about how to commit the changes. I have committed it on libreoffice/core repository on github. Is that valid? I'm sorry if I have done anything wrong. Thank you! [1]https://bugs.documentfoundation.org/show_bug.cgi?id=114441 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Libre Office Installation Error
Hey Team, I started my libre office set up by following the steps given at official site. After installing all the dependencies, I executed this step... $ git clone git://anongit.freedesktop.org/libreoffice/core libreoffice But I am receiving this error: ** fatal: read error: Connection reset by peer1.12 GiB | 233.00 KiB/s fatal: early EOF fatal: index-pack failed ** Then I tried this: git clone https://gerrit.libreoffice.org/core libreoffice Again I received same kind of error: ** error: RPC failed; curl 56 GnuTLS recv error (-9): A TLS packet with unexpected length was received. fatal: the remote end hung up unexpectedly fatal: early EOF fatal: index-pack failed *** I tried troubleshooting this: I followed the steps given on this: https://devopscube.com/gnutls-handshake-failed-aws-codecommit/ But at the end I am receiving this error: *** dpkg: dependency problems prevent configuration of git: git depends on git-man (<< 1:2.7.4-.); however: Version of git-man on system is 1:2.20.1-0ppa1~ubuntu16.04.1. dpkg: error processing package git (--install): dependency problems - leaving unconfigured Errors were encountered while processing: git *** After all this I tried cloning the repository directly from github(libreoffice/core repository): In this, after successful execution of ./autogen.sh, make command gives errors: *** This is what I get on terminal- komal@komal-Vostro-15-3568:~/core-master$ /usr/bin/make /bin/sh: 1: .: Can't open /home/komal/core-master/sources.ver Makefile:250: *** Error while retrieving $lo_sources_ver from /home/komal/core-master/sources.ver. Stop. I would be really very grateful, if I could get help in this. I am totally stuck. I have tried lot many ways but couldn't resolve the errors. Sorry, for creating this nuissance. But I really need help! Thank you Team in anticipation! Regards, Komal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Libre Office Local Installation
Hi, I am Komal, 4th year engineering student, from Pune(India). I am novice to open source, but I am really interested in learning and contributing for this organization. I have been trying local installation of source code but could n't resolve the error at last step. There are some issues when I build the program.(After successful execution of ./autogen.sh, make command gives errors). Moreover, I have directly downloaded the libre office repository from github. Then followed the steps given on official site of libre office. This is what I get on terminal- komal@komal-Vostro-15-3568:~/core-master$ /usr/bin/make /bin/sh: 1: .: Can't open /home/komal/core-master/sources.ver Makefile:250: *** Error while retrieving $lo_sources_ver from /home/komal/core-master/sources.ver. Stop. I would be really grateful, if I could get any help in this regard. Thanking you in anticipation! Regards, Komal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
