25 Jul
2012
25 Jul
'12
9:26 p.m.
All,
I want to build a set of 3.5.13 packages for arch. I have made a copy of my
GIT tree and I want to revert it back. I tried to follow Slavek's advice of using
(switch to v3.5.13-sru branch)
git checkout v3.5.13-sru && git pull && git submodule update
However, that fails:
16:23 providence:~/pvd/tde13/tde> git checkout v3.5.13-sru
error: pathspec 'v3.5.13-sru' did not match any file(s) known to git.
I have seen the v3.5.13-sru label before during updates, but I can't figure
out how to go back. What say the experts?
--
David C. Rankin, J.D.,P.E.
25 Jul
25 Jul
10:31 p.m.
New subject: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On 07/25/2012 04:26 PM, David C. Rankin wrote:
All,
I want to build a set of 3.5.13 packages for arch. I have made a copy of my
GIT tree and I want to revert it back. I tried to follow Slavek's advice of using
(switch to v3.5.13-sru branch)
git checkout v3.5.13-sru && git pull && git submodule update
However, that fails:
16:23 providence:~/pvd/tde13/tde> git checkout v3.5.13-sru
error: pathspec 'v3.5.13-sru' did not match any file(s) known to git.
I have seen the v3.5.13-sru label before during updates, but I can't figure out
how to go back. What say the experts?
Or is there a way for me to use the 3.5.13 tarballs and apply patches to the
source to move it forward to 3.5.13-sru? Maybe a git 'tag' or 'commit'
number to
put in a git command??
I don't even see the 3.5.13-sru tag any more when I use the switch_all script to
update the tree, so maybe something got messed up with that branch?
--
David C. Rankin, J.D.,P.E.
10:32 p.m.
New subject: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On Wednesday 25 of July 2012 23:26:25 David C. Rankin wrote:
All,
I want to build a set of 3.5.13 packages for arch. I have made a copy of
my GIT tree and I want to revert it back. I tried to follow Slavek's advice
of using
(switch to v3.5.13-sru branch)
git checkout v3.5.13-sru && git pull && git submodule update
However, that fails:
16:23 providence:~/pvd/tde13/tde> git checkout v3.5.13-sru
error: pathspec 'v3.5.13-sru' did not match any file(s) known to git.
I have seen the v3.5.13-sru label before during updates, but I can't
figure out how to go back. What say the experts?
Here is not yet 3.5.13-sru branch on the "meta" project "tde". It is
therefore
necessary to switch individual modules.
Slavek
--
10:52 p.m.
New subject: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
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).
--
David C. Rankin, J.D.,P.E.
10:57 p.m.
New subject: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On 07/25/2012 05:52 PM, David C. Rankin wrote:
On 07/25/2012 05:32 PM, Slávek Banko wrote:
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'
--
David C. Rankin, J.D.,P.E.
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).
26 Jul
26 Jul
midnight
New subject: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On Thursday 26 of July 2012 00:57:16 David C. Rankin wrote:
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:
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'.
Slavek
--
12:59 a.m.
New subject: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
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 :)
--
David C. Rankin, J.D.,P.E.
1:40 a.m.
New subject: [SOLVED] Re: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On 07/25/2012 07:59 PM, David C. Rankin wrote:
On 07/25/2012 07:00 PM, Slávek Banko wrote:
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 :)
--
David C. Rankin, J.D.,P.E.
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 :)
9:18 p.m.
New subject: [trinity-devel] [SOLVED] Re: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On 07/25/2012 08:40 PM, David C. Rankin wrote:
On 07/25/2012 07:59 PM, David C. Rankin wrote:
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).
--
David C. Rankin, J.D.,P.E.
On 07/25/2012 07:00 PM, Slávek Banko wrote:
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 :)
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 :)
10:04 p.m.
New subject: [trinity-devel] [SOLVED] Re: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??
On 07/26/2012 04:18 PM, David C. Rankin wrote:
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.
Oops - NOTE, you also need to set the 'branch' variable in the script to either
'master' or 'v3.5.13-sru' (default).
--
David C. Rankin, J.D.,P.E.
4553
days inactive
4554
days old
9 comments
2 participants
participants (2)
-
David C. Rankin -
Slávek Banko