On 07/25/2012 05:52 PM, David C. Rankin wrote:

On 07/25/2012 05:32 PM, Slávek Banko wrote:

...

Here is not yet 3.5.13-sru branch on the "meta" project "tde". It is therefore necessary to switch individual modules.

Slavek

I'm having trouble with that too :( Reading, I should be able to do:

git submodule foreach --recursive "git checkout v3.5.13-sru"

That also gives the error:

17:45 providence:/mnt/pv/home/david/tde13/tde> git submodule foreach --recursive "git checkout v3.5.13-sru" Entering 'experimental' error: pathspec 'v3.5.13-sru' did not match any file(s) known to git. Stopping at 'experimental'; script returned non-zero status.

In the individual applications of git.trinitydesktop.org, I do see the branch listed "origin/v3.5.13-sru".

So do I need to write a quick script to loop through each of the modules in main, main/dependencies, main/applications and do it in each directory? If so, then how would I update the tree when you make changes? Same way? If I do a normal git pull, wouldn't that just switch back to HEAD or origin/master?

Thank you for trying to help! We will git this figured out (no pun intended).

OK,

That's what you have to do. Just set up the script and do it on a per-directory basis. Can't we set up some top-level branch in the GIT tree that holds the v3.5.13-sru info so users can just do a single checkout and have it setup 3.5.13-sru? Here is what I will do:

17:53 providence:/mnt/pv/home/david/tde13/tde/main/applications/amarok> git checkout v3.5.13-sru M admin M cmake Branch v3.5.13-sru set up to track remote branch v3.5.13-sru from origin. Switched to a new branch 'v3.5.13-sru'

17:54 providence:/mnt/pv/home/david/tde13/tde/main/applications/amarok> git pull Already up-to-date.

17:54 providence:/mnt/pv/home/david/tde13/tde/main/applications/amarok> git submodule update Submodule path 'admin': checked out 'e4edddce0ad20cd639e6ea1b21bb3bb6b0a3a3d9' Submodule path 'cmake': checked out '8552bcafcd974f7303bb3cc4947b30a7ce0533f9'

On 07/25/2012 07:00 PM, Slávek Banko wrote:

I am aware that it is now difficult. This is based on the fact that in the beginning of the work I have no idea about the extent SRU release, so I just cloned the individual projects. Indeed, in the beginning I did not even have write access to GIT :)

But I'm working on improving the situation. Currently I walking through patches in the tde-packaging (for debian + ubuntu). Right after that I plan to prepare v3.5.13-sru in 'tde'.

I'll post the script when I'm done along with a list of all modules that presently have -sru branch. Good work :)

On 07/25/2012 08:40 PM, David C. Rankin wrote:

On 07/25/2012 07:59 PM, David C. Rankin wrote:

...

On 07/25/2012 07:00 PM, Slávek Banko wrote:

...

I am aware that it is now difficult. This is based on the fact that in the beginning of the work I have no idea about the extent SRU release, so I just cloned the individual projects. Indeed, in the beginning I did not even have write access to GIT :)

But I'm working on improving the situation. Currently I walking through patches in the tde-packaging (for debian + ubuntu). Right after that I plan to prepare v3.5.13-sru in 'tde'.

I'll post the script when I'm done along with a list of all modules that presently have -sru branch. Good work :)

Slávek

Thank you for pointing me in the right direction. I have attached the list of modules that I checked out to v3.5.13-sru along with the script I used to do it. (see if the list looks complete)

NOTE: this script is just used to change to v3.5.13-sru the *first* time and log which modules were switched. It is NOT used to update modules you have already switched. (I'll have to write another to test git branch -l against git branch -r before checkout, pull and submodule update).

But this works and I can create tarballs from v3.5.15-sru now :)

Updated script. This is somewhat of a TDE GIT swiss-army knife. Here is the -h help info:

Usage: gitcosru.sh [-u, -w] [-l, -s (branchname)]

gitcosru.sh (options) [(branchname)] will write commands to stdout needed to create tarballs from your local TDE GIT tree (default - no options/arguments). When called with the '-w' argument, the script will create tarballs from from your local GIT tree in the directory specified by 'tgzpath' within the script. When called with the '-u' option, it will update the current GIT tree.

The '-l' and '-s branchname' options will (-l) list the current branch for each module in the git tree and (-s branchname) will switch each module in the GIT tree to the given GIT branch if it is available for that module. In addition a 'git pull' and 'git submodule update' are called on each module switched.

NOTE:: You MUST set the variables 'tdepath' and 'tgzpath' (and 'gituser') in the script for the script to work. tdepath is the path to your local GIT tree and tgzpath is where you want the completed tarballs placed. gituser (optional) is just your username for the TDE GIT tree. Enjoy.

ALSO note that the list of modules, branches, and available branches is written to a temporary file /tmp/v3.5.13-sru_modules-$date.txt. Example:

15:43 providence:~/pvd/tde13/tde> cat /tmp/v3.5.13-sru_modules-20120726-153123.txt module: common branch: master available: HEAD master module: tdeaccessibility branch: v3.5.13-sru available: HEAD master v3.5.13-sru module: tdeaddons branch: v3.5.13-sru available: HEAD master v3.5.13-sru module: tdeadmin branch: v3.5.13-sru available: HEAD master v3.5.13-sru module: tdeartwork branch: v3.5.13-sru available: HEAD master v3.5.13-sru module: tdebase branch: v3.5.13-sru available: HEAD master v3.5.13-sru module: tdebindings branch: v3.5.13-sru available: HEAD master v3.5.13-sru

You can just disable this in the script if you don't want the list generated. It is also written to stdout (via | tee -a).