tde-devels

devels@trinitydesktop.org

3 participants
3808 discussions

git CONFLICT - cannot resolve main/thirdparty and scripts - howto resolve?
by David C. Rankin 24 Dec '13

24 Dec '13

All, I believe my origin/master local git checkout is almost fixed, but I have several nasty warning and errors that remain when I run: /scripts/switch_all_submodules_to_head_and_clean The error are primarily with main/thirdparty and scripts. The full output of /scripts/switch_all_submodules_to_head_and_clean is available here along with the git status: http://www.3111skyline.com/dl/dt/trinity/err/git/master-conflicts.txt http://www.3111skyline.com/dl/dt/trinity/err/git/git-status.txt A summary of the errors are: 02:07 phoinix:/dat_e/tde> ./scripts/switch_all_submodules_to_head_and_clean drankin Preparing /dat_e/tde for development use error: 'main/thirdparty' appears as both a file and as a directory error: main/thirdparty: cannot drop to stage #0 warning: unable to rmdir scripts: Directory not empty HEAD is now at 8303efe Reset submodule main/tdepim to latest HEAD Auto-merging submodules CONFLICT (add/add): Merge conflict in submodules Adding scripts/update_all_submodules Adding scripts/switch_all_submodules_to_head_and_clean Adding scripts/commit_all_submodules Adding scripts/README CONFLICT (directory/file): There is a directory with name scripts in HEAD. Adding scripts as scripts~580909096c254a79aebd7c852d91b002cdf31c37 Adding main/thirdparty/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice-debian.diff Adding main/thirdparty/libreoffice/3.6.0/patches/README Adding main/thirdparty/libreoffice/3.3.3/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.3.3/patches/libreoffice-trinity-debian.diff Adding main/thirdparty/libreoffice/3.3.3/patches/NOTES Adding main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity-debian.diff Adding main/thirdparty/libreoffice/3.3.2/patches/NOTES CONFLICT (directory/file): There is a directory with name main/thirdparty in HEAD. Adding main/thirdparty as main/thirdparty~580909096c254a79aebd7c852d91b002cdf31c37 Auto-merging main/tdewebdev CONFLICT (submodule): Merge conflict in main/tdewebdev Auto-merging main/tdevelop <snip -- many, many more CONFLICT (submodule)...> CONFLICT (add/add): Merge conflict in README.GIT Auto-merging .gitmodules CONFLICT (add/add): Merge conflict in .gitmodules Automatic merge failed; fix conflicts and then commit the result. error: 'main/thirdparty' appears as both a file and as a directory error: main/thirdparty: cannot drop to stage #0 warning: unable to rmdir scripts: Directory not empty HEAD is now at 8303efe Reset submodule main/tdepim to latest HEAD <snip> Cloning into 'main/applications/kdmtheme'... fatal: repository 'http://drankin@scm.trinitydesktop.org/scm/git/kdmtheme/' not found Clone of 'http://drankin@scm.trinitydesktop.org/scm/git/kdmtheme' into submodule path 'main/applications/kdmtheme' failed Entering 'experimental' Previous HEAD position was be11de5... Add tqt3 binary rename Switched to branch 'master' Your branch is up-to-date with 'origin/master'. <snip> Entering 'main/dependencies/python-tqt' Already on 'master' Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) <snip> Entering 'main/dependencies/python-tqt' Updating 9092fbf..a582675 Fast-forward sip/qt/qstyle.sip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) <snip> Entering 'experimental' This script can only be run from a top level git directory. Exiting... Stopping at 'experimental'; script returned non-zero status. The git status command shows the following: 02:38 phoinix:/dat_e/tde> git status On branch master Your branch and 'origin/master' have diverged, and have 8401 and 3271 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: .gitmodules deleted: main/applications/kdmtheme Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: experimental (new commits) modified: main/applications/abakus (new commits) modified: main/applications/adept (new commits) modified: main/applications/amarok (new commits) <snip> I was able to manually 'git rm main/applications/kdmtheme' to resolve that issue, but no matter if I "git add <file>..." or "git checkout -- <file>...", when I go to "git commit -a" I am left in vim with: 03:22 phoinix:/dat_e/tde> cat .git/COMMIT_EDITMSG # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Committer: David C. Rankin <david (the at symbot) rlfpllc.com> # # On branch master # Your branch and 'origin/master' have diverged, # and have 8401 and 3271 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) # # Changes to be committed: # modified: .gitmodules # modified: experimental # modified: main/applications/abakus # modified: main/applications/adept # modified: main/applications/amarok # modified: main/applications/basket I just want to overwrite whatever I have with HEAD, not commit anything back to git.trinitydesktop.org -- so what should I do when I am prompted by git commit -a with this long file of commented changes? Any help would be greatly appreciated. -- David C. Rankin, J.D.,P.E.

1 0

Switch debian/ubuntu packages format to quilt
by Slávek Banko 24 Dec '13

24 Dec '13

Tim, Michele, I noticed in Jessie was updated dpkg to version 0.17.5. This is a problem for the current package format in nightly-builds. See: http://bugs.trinitydesktop.org/show_bug.cgi?id=1782 The question is how to solve this problem in a relationship of the approaching release date of R14.0.0? The structure of the version that we now use in nigthly-builds and which is similarly used for SRU versions (here we already use ~preXXX instead of +rXXX), allows switch to quilt format. But to make such change in the nightly-builds at this time? Or suspend building Jessie packages for this time? Or in Jessie images on build-farm hold the previous version of dpkg for this time? Note: As I mentioned in my script to prepare the source deb package I already use quilt format, so as soon as I'll begin prepare packages for R14.0.1, the problem with Jessie will be resolved for SRU. And it will be a better time to edit the script for nightly-builds packages. What are your suggestions? Slavek

3 2

Re: [trinity-devel] Latest upstream package support for R14.0.0
by Darrell Anderson 23 Dec '13

23 Dec '13

>My current version (Debian/Jessie): >- g++ / libstdc++6 4.8.2 >- cmake 2.8.12.1 >- automake 1.14 Thanks. What versions of cups and libpng? Darrell

2 1

http://git.trinitydesktop.org/cgit/scripts/tree/switch_all_submodules_to_head_and_clean
by David C. Rankin 23 Dec '13

23 Dec '13

Git gurus, A couple of questions: (1) Why does the new script contain 'ff' in the following when there is no provision to use the -f option more than once in https://www.kernel.org/pub/software/scm/git/docs/git-clean.html: git clean -dxff shouldn't it just be 'git clean -dxf' (2) Is there any difference between: git submodule foreach "git checkout $branch" git submodule foreach "$THISSCRIPT $gituser" and git submodule foreach "git checkout $branch && $THISSCRIPT $gituser" logically it looks like the answer is nothing, but it never hurts to ask. Additionally, I've been using the --recursive option with the submodule foreach calls: git submodule update --recursive git submodule foreach --recursive "git checkout $branch" Is there any reason against continuing to use the --recursive flag if we are now calling $THISSCRIPT recursively? Thanks. -- David C. Rankin, J.D.,P.E.

1 0

Re: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?
by Darrell Anderson 23 Dec '13

23 Dec '13

>uugh... I was really trying to avoid that. I'll have to find my >notes how to >move tde git from machine-to-machine (changing some tags in >.git/... so that >they will re-sync from the other boxes when git pull is run. (I >have my tde & >tde_3.5.13 on multiple-boxes for building. Oh well, that will >teach me to let >the repos get so stale.. Not that misery loves company, :) but about two weeks ago I had all kinds of git problems. Check the mail list archives. Basically I wasted an entire Saturday fixing everything. I still don't know the root cause why everything blew up. "Oh, but wait, git is free/libre software and Linus is a god --- please roll over in the mud. Then pee all over yourself and pretend your happy!" ;) Darrell

1 0

Re: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?
by Darrell Anderson 23 Dec '13

23 Dec '13

>Adding main/thirdparty/libreoffice/3.3.2/patches/libreoffice- >trinity-debian.diff >Adding main/thirdparty/libreoffice/3.3.2/patches/NOTES >CONFLICT (directory/file): There is a directory with name >main/thirdparty in >HEAD. Adding main/thirdparty as >main/thirdparty~023b18ec6b52629d8666d284152f6147af098595 >Auto-merging main/tdewebdev >CONFLICT (submodule): Merge conflict in main/tdewebdev >Auto-merging main/tdevelop >CONFLICT (submodule): Merge conflict in main/tdevelop >Auto-merging main/tdeutils >CONFLICT (submodule): Merge conflict in main/tdeutils >Auto-merging main/tdetoys >... > >The concern I have is I get those CONFLICT messages even if I re- >run the script >after it completes. Is there some magic git command I should run >to resolve the CONFLICT? I never have seen those errors and I'm the last person around here to ask for help with git. I hate git. Yet Another Overly Complicated Tool Created By Masochistic Geeks Intended Only for Masochistic Geeks. :) I hold my breath every time I resync my local tree. My guess is you are seeing those errors because your local tree is long out-of-date. Perhaps delete each affected CONFLICT module and then run the switch_all_submodules_to_head_and_clean script. Yeah, again and again. Or, consider deleting the entire local tree and perform a git clone --- overnight because the repo is 5.5 GB or so. tde-i18n is the biggest pig module of them all and will take the longest. Darrell

2 1

Re: [trinity-devel] Do new git branches and tags (master->origin/master, etc.) change repo update calls?
by Darrell Anderson 23 Dec '13

23 Dec '13

>Additionally, > > I have hit numerous fatal errors running the >switch_all_submodules_to_head_and_clean script. Examples: >I have had similar failures with: > >kdmtheme >kio-apt >kio-locate >kio-umountwrapper >networkmanager9 All of those modules have been renamed. >I guess these have all been removed from the tree, but is there a >way to tell git to just erase them and keep going instead of failing? After you manually update the switch_all_submodules_to_head_and_clean script all modules should update correctly, which will include removing the old modules and pulling the renamed modules. Darrell

2 1

Do new git branches and tags (master->origin/master, etc.) change repo update calls?
by David C. Rankin 23 Dec '13

23 Dec '13

Tim, all, After a hiatus, I was updating my tde repos to see how horribly screwed I am attempting to build on Arch after their LSB and systemd changes. Pulling head I noted several new branch and tag names. I know what they are, but they look like they have added origin as a path component to 3.5.13-sru, etc.. Specifically, I saw: From http://scm.trinitydesktop.org/scm/git/tde + 8303efe...6fd6395 master -> origin/master (forced update) * [new branch] v3.5.13-sru -> origin/v3.5.13-sru So it looks like v3.5.13-sru is now origin/v3.5.13-sru. The question that brought up was "do I need to modify any of the scripts I use that update my local git repo to handle the 'origin/v3.5.13-sru' designation, or will the change be handled by the .gitmodule data? Additionally, there were new tags noted: ec1d9d9..9ec64b2 master -> origin/master 5ae82a0..169c39a v3.5.13-sru -> origin/v3.5.13-sru * [new tag] v3.5.13.1 -> v3.5.13.1 * [new tag] v3.5.13.2 -> v3.5.13.2 Same question, is there anything I would need to change in my existing checkout scripts such as: git submodule foreach --recursive "git checkout v3.5.13-sru" to reflect the new branch or tag designations? Like: git submodule foreach --recursive "git checkout origin/v3.5.13-sru" Also, if there are any new links or pointers for building 3.5.13 on bleeding edge distros like Arch, I would appreciate them as well. What is the state of HAL requirements? I presume it is still fully required in 3.5.13, but what about 14? I will be building 3.5.13, so I'll start by checking on the state of HAL in the Arch user repository. Thanks for any help you can give :) -- David C. Rankin, J.D.,P.E.

1 1

Re: [trinity-devel] How to insert a cmake variable into a *.desktop file
by Darrell Anderson 22 Dec '13

22 Dec '13

>Is it still actual? >Anyway... for future generations... the syntax is: > >Exec=@CMAKE_VARIABLE@ > >The desktop file is supposed to have ".cmake" extension. >In CMakeLists.txt use configure_file() statement. > >You can use e.g. tdebase/kdesktop/kdesktop.desktop.cmake as an >example... Thank you. As Slavek mentioned, I did learn how to do this. The challenge now is remembering. :) Darrell

1 0

Re: [trinity-devel] Etherpad font sizes
by Darrell Anderson 22 Dec '13

22 Dec '13

>I assume that the scale will help to Darrell, and there is no need >to change >the default font size. By the way, I sometimes adjusts to 85%. You must have a very large monitor. I have a 19" wide screen. Between the newly discovered magnifier option and browser fonts, I now have something --- acceptable. I notice the past many years an obsession by software and web site developers to use the smallest damn fonts possible. I presume the real problem is people using TVs for computer monitors and never testing anything on a standard desktop monitor. I notice the etherpad does not remember my magnification setting. Is there a way to preserve that? Darrell

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

tde-devels