Hi all,
My git foo is obviously not what it should be. I have been merging
branches using the same basic commands the past few weeks. First, I
position myself in the local branch on my system that I want to merge
with a remote branch. Then I do a git-pull of the remote branch which
then merges it with the local branch. I am used to seeing messages
like this:
Auto-merged gdb/windows-tdep.h
CONFLICT (rename/modify): Merge conflict in gdb/windows-tdep.h
Auto-merged COPYING.NEWLIB
CONFLICT (content): Merge conflict in COPYING.NEWLIB
Auto-merged ChangeLog
CONFLICT (content): Merge conflict in ChangeLog
.
.
.
Then I go through and fix the conflicts and check them in after making
sure it all builds and runs "make check" successfully.
Now I am trying to merge Jan's archer-jankratochvil-vla branch and I
am seeing something different and I am wondering what the heck I am
doing wrong. Here is the sequence:
git-pull ssh://sources.redhat.com/git/archer.git archer-jankratochvil-vla
Enter passphrase for RSA key '/home/rmoseley/.ssh/identity':
From ssh://sources.redhat.com/git/archer
* branch archer-jankratochvil-vla -> FETCH_HEAD
Auto-merged gdb/dwarf2read.c
Merge made by recursive.
gdb/ada-lang.c | 23 +-
gdb/c-typeprint.c | 7 +-
gdb/coffread.c | 2 +-
gdb/dwarf2expr.c | 7 +
gdb/dwarf2expr.h | 2 +-
gdb/dwarf2loc.c | 213 ++++++-
gdb/dwarf2loc.h | 6 +
gdb/dwarf2read.c | 419 ++++++++++----
gdb/eval.c | 51 ++-
gdb/f-lang.h | 4 +
gdb/f-typeprint.c | 36 +-
gdb/f-valprint.c | 59 ++-
gdb/findvar.c | 124 +++--
gdb/gdbtypes.c | 755
+++++++++++++++++++----
gdb/gdbtypes.h | 150 ++++-
gdb/jv-lang.c | 2 +-
gdb/mdebugread.c | 2 +-
gdb/mi/mi-main.c | 1 +
gdb/printcmd.c | 5 +
gdb/stabsread.c | 4 +-
gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S | 455 ++++++++++++++
gdb/testsuite/gdb.arch/x86_64-vla-typedef.c | 43 ++
gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp | 64 ++
gdb/testsuite/gdb.base/vla-overflow.c | 30 +
gdb/testsuite/gdb.base/vla-overflow.exp | 108 ++++
gdb/testsuite/gdb.base/vla.c | 55 ++
gdb/testsuite/gdb.base/vla.exp | 62 ++
gdb/testsuite/gdb.dwarf2/dw2-stripped.c | 42 ++
gdb/testsuite/gdb.dwarf2/dw2-stripped.exp | 79 +++
gdb/testsuite/gdb.fortran/dynamic.exp | 156 +++++
gdb/testsuite/gdb.fortran/dynamic.f90 | 98 +++
gdb/testsuite/gdb.fortran/string.exp | 72 +++
gdb/testsuite/gdb.fortran/string.f90 | 37 ++
gdb/top.c | 1 +
gdb/typeprint.c | 13 +-
gdb/valarith.c | 62 ++-
gdb/valops.c | 89 +++-
gdb/value.c | 58 ++-
gdb/value.h | 8 +-
39 files changed, 2966 insertions(+), 438 deletions(-)
create mode 100644 gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
create mode 100644 gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
create mode 100644 gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
create mode 100644 gdb/testsuite/gdb.base/vla-overflow.c
create mode 100644 gdb/testsuite/gdb.base/vla-overflow.exp
create mode 100644 gdb/testsuite/gdb.base/vla.c
create mode 100644 gdb/testsuite/gdb.base/vla.exp
create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-stripped.c
create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
create mode 100644 gdb/testsuite/gdb.fortran/dynamic.exp
create mode 100644 gdb/testsuite/gdb.fortran/dynamic.f90
create mode 100644 gdb/testsuite/gdb.fortran/string.exp
create mode 100644 gdb/testsuite/gdb.fortran/string.f90
After that, I do this:
git status
# On branch archer-rmoseley-f11-merge
nothing to commit (working directory clean)
git does not seem to acknowledge that files have changed. I know they
have because I have a pristine copy of archer-rmoseley-f11-merge
checked out in a different directory and I do a diff and see the
chanages.
Any ideas why git is not recognizing files have changed after the merge?
Thanks,
Rick