trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: July 2012

Re: [trinity-devel] How do I switch a copy of the GIT tree to v3.5.13-sru??

From: "David C. Rankin" <drankinatty@...>
Date: Wed, 25 Jul 2012 17:57:16 -0500
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'


-- 
David C. Rankin, J.D.,P.E.