Experimental Physics and Industrial Control System
Hi Dirk,
Try this command:
git submodule foreach git diff
Mark
________________________________
From: [email protected] <[email protected]> on behalf of Dirk Zimoch <[email protected]>
Sent: Wednesday, November 29, 2017 3:49 AM
To: [email protected]
Subject: Re: git problem
On 29.11.2017 10:33, Dirk Zimoch wrote:
>
>
> On 29.11.2017 10:13, Dirk Zimoch wrote:
>> The problem is that base-7.0.1-pre1 now compiles for me but when I try
>> to get the changes into core/master, it does not compile.
>
> To be exact:
> ../pdb.cpp:721: error: no 'void FieldName::show() const' member function
> declared in class 'FieldName'
That was my error when manually getting the changed from base-7.0.1-pre1
into the core/master branch. Works now.
But now I want to produce the diff and only get this:
$ git diff
diff --git a/modules/libcom b/modules/libcom
index ea7802a..fae4d58 160000
--- a/modules/libcom
+++ b/modules/libcom
@@ -1 +1 @@
-Subproject commit ea7802a8383fa330f2fcc9497bbeca8073325a3e
+Subproject commit fae4d58de691583116ee401532a9bd1ee8bb5f03
diff --git a/modules/normativeTypes b/modules/normativeTypes
index 5e151c3..91c5136 160000
--- a/modules/normativeTypes
+++ b/modules/normativeTypes
@@ -1 +1 @@
-Subproject commit 5e151c3b7a23ec4f04332b587349c6ae542d4dd2
+Subproject commit 91c51368833fb04b32f478f3af65179de6551ff7
diff --git a/modules/pvAccess b/modules/pvAccess
index ba3b777..e61d102 160000
--- a/modules/pvAccess
+++ b/modules/pvAccess
@@ -1 +1 @@
-Subproject commit ba3b777978dbdfb40c59aa94742a41c08618e4b7
+Subproject commit e61d10200eac2ea89defa3a3b623678063eef1a3-dirty
diff --git a/modules/pvData b/modules/pvData
--- a/modules/pvData
+++ b/modules/pvData
@@ -1 +1 @@
-Subproject commit 71966581661ab91e7cfc927c3468639d6d53cf6c
+Subproject commit 71966581661ab91e7cfc927c3468639d6d53cf6c-dirty
diff --git a/modules/pva2pva b/modules/pva2pva
index 413102a..8f92190 160000
--- a/modules/pva2pva
+++ b/modules/pva2pva
@@ -1 +1 @@
-Subproject commit 413102a4bca07bae097e10850f99b522e3b5e8a5
+Subproject commit 8f92190ff9510584363b94d5e9a252982e0f037e-dirty
diff --git a/modules/pvaClient b/modules/pvaClient
index 5a84b94..ea5809b 160000
--- a/modules/pvaClient
+++ b/modules/pvaClient
@@ -1 +1 @@
-Subproject commit 5a84b94520f32c9fe3bfe514c19154e4fa0c0804
+Subproject commit ea5809be9b81cd5857999bdbee687dbf3c1326e0
- References:
- git problem Dirk Zimoch
- Re: git problem Dirk Zimoch
- Re: git problem Dirk Zimoch
- Navigate by Date:
- Prev:
Re: git problem Dirk Zimoch
- Next:
SIML type CA and PINI=YES issue Ralph Lange
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
<2017>
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: git problem Dirk Zimoch
- Next:
Re: git problem Andrew Johnson
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
<2017>
2018
2019
2020
2021
2022
2023
2024