Re: [boost] [githelp]

Subject: Re: [boost] [githelp]
From: Bjørn Roald (bjorn_at_[hidden])
Date: 2016-02-17 15:17:45

> On 17 Feb 2016, at 17:02, Rene Rivera <grafikrobot_at_[hidden]> wrote:
> 
> How can I find out what changes are not merged from develop to master, for
> all subrepos, but only changes I've made?
> 

I would think it is basically the commits reachable in history from develop branch head but not reachable from master branch head.  If you need this only once it is probably not worth making a script, rather you could do something like:

git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> develop —  > develop.log
git submodule foreach git log —full-history —author=<pattern> —committer=<pattern> —grep=<pattern> master —  > master.log

<favorite diff tool> develop.log master.log

You can mix and repeat the pattern options as you need if you have or want multiple user id´s or want to search for other texts that will include commits.  The key is the logs will potentially be long, but most commits will be the same in the two branches.  You are only interested in those in develop that are not in master and the diff should point those out. 

git submodule foreach git log —full-history —author=grafikrobot_at_[hidden] develop —  > develop.log
git submodule foreach git log —full-history —author=grafikrobot_at_[hidden] master —  > master.log
diff develop master | grep "^<" 
< commit 2b8b43fe1de0b101459445f4885e1116bdfb9ebc
< Author: Rene Rivera <grafikrobot_at_[hidden]>
< Date:   Fri Dec 18 14:17:35 2015 -0600
< 
<     Fix project name to not collide with coroutine1.
< Entering 'libs/fusion'
< Entering 'libs/geometry'
< commit f13b300eb4ac17dce0bb84cff3b9b461397158f3
< Date:   Mon Dec 21 21:17:32 2015 -0600
<     Support avoiding running b2 in new release doc builds.
< commit 6929cab9a3b1caf3cd4856ded91518cdaa6574b6
< Date:   Mon Dec 14 14:43:12 2015 -0600
<     Adjust building so that we can override build/install locations for CI building.
< commit 76067ad5d25d8f87bd4d39c667a444368df59102
< Date:   Thu Apr 13 20:07:57 2006 +0000
<     Remove now uneeded header dependency.
<     [SVN r33690]
< commit 15b07291819d53e03981e29da2afdb08dd78437d
< Date:   Thu Apr 13 20:01:51 2006 +0000
<     Allow keywords to be copyable and default constructable, to facilitate use of keywords outside of Boost.Parameter.
<     [SVN r33689]
< commit 631b6467802a16feb9ed50442cfb6024c341f049
< Author: Rene Rivera <grafikrobot_at_[hidden]>
< Date:   Fri Dec 18 15:36:23 2015 -0600
< 
<     Fix so that doc build works unmodded in Boost tree.
< 
< commit 33836c711655042ebcde1246b5f1e3df7e947b7e
< Date:   Mon Jan 11 17:00:39 2016 -0600
< 
<     The docs are not buildable as this Jamfile is written. Remove for correctness.
< 
< commit 13cb3ac80dfc7798ddf9cee67cd6c232cf26b158
< Author: Rene Rivera <grafikrobot_at_[hidden]>
< Date:   Fri Dec 18 16:00:42 2015 -0600
<     Fix syntax to be able to parse doc build file.
< commit c394d0a5ae91cb314cb0b57c69a5cc5b18893f6c
< Date:   Mon Dec 21 22:32:05 2015 -0600
<     Fix outdated path to boostbook css.
< commit f0c77dd22d49d75df2667f4d82fba1b4288e025f
< Date:   Tue Dec 15 15:06:22 2015 -0600
<     Release CI.. Allow overriding install location.
< Entering 'tools/bcp'
< commit f4fcc7802c09df43755adbe33bd8d6894d1a8f09
< Author: Rene Rivera <grafikrobot_at_[hidden]>
< Date:   Tue Dec 15 13:56:52 2015 -0600
< 
<     Release CI.. Allow overriding install location.
< 

—
Bjørn