Re: Problem merging with git

[Rick Moseley <rmoseley at redhat dot com>]

Jan Kratochvil wrote:
> On Wed, 18 Feb 2009 16:49:28 +0100, Rick Moseley wrote:
>   
> > I am used to seeing messages like this:
> >
> > Auto-merged COPYING.NEWLIB
> > CONFLICT (content): Merge conflict in COPYING.NEWLIB
> >     
>
> This should never happen as AFAIK no branch in the Archer project should
> modify files like COPYING.NEWLIB.  If you see this message someone (who you
> merge from) had to do something unclean regarding the branching/versioning.
> IMO you should postpone such merge and ask the author to fixup his branch
> first otherwise you start cluttering by needless conflict resolutions the
> merge branch.
>
> According to
> 	for i in `git branch -r|grep archer-`;do git diff origin/master...$i|grep -q COPYING.NEWLIB && echo $i;done
> these are
> 	origin/archer-pmuldoon-pretty-printers-lookup
> 	origin/archer-tromey-python
> 	(sure just a consequence) origin/archer-rmoseley-fedora-merge
>
> I am a GIT newbie so please correct me if diff
> origin/master...origin/archer-BRANCH is not appropriate way how to show the
> branch-specific changes against upstream ignoring any differences due to
> possibly newer origin/master.
>
>
>   
> > 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:
> >     
>
> Just the merge with archer-jankratochvil-vla happened the way how every other
> merge should happen in most cases.
>
> ...
>   
> > Auto-merged gdb/dwarf2read.c
> > Merge made by recursive.
> >     
> ...
>   
> > 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.
> >     
>
> The last merge is visible in `git log', isn't it?
>   

Yes, it appears to be:

git log
commit 396b49611247265f167ebdfc78ff09aa896d1e3c
Merge: e947ab6... 9d03935...
Author: Rick Moseley <rmoseley@localhost.localdomain>
Date:   Wed Feb 18 09:18:30 2009 -0600

   Merge branch 'archer-jankratochvil-vla' of 
ssh://sources.redhat.com/git/archer into archer-rmoseley-f11-merge

commit e947ab663936483dc67424c153f67e78a910b96b
Author: Nick Clifton <nickc@redhat.com>
Date:   Thu Feb 12 15:06:54 2009 +0000

           PR 9827
           * elflink.c (bfd_elf_final_link): When counting the relocations,
           if the header size has not been set yet then assume that it will
           match the output section's reloc type.

commit ad88187efac2686ec0b15c558e05262a003ba504
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 12 09:15:06 2009 +0000

   gdb/
       PR fortran/9806
       * dwarf2read.c (process_die <DW_TAG_module>, read_module)
       (scan_partial_symbols <DW_TAG_module>, add_partial_module): New.
  
   gdb/testsuite/
       PR fortran/9806
       * gdb.fortran/module.exp, gdb.fortran/module.f90: New.

commit 57f9b3e3aca4b09da7dee45bba37a60653de27ee
Author: Nathan Sidwell <nathan@codesourcery.com>
Date:   Thu Feb 12 08:31:02 2009 +0000

       gas/
       * config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
       (mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
       (mcf5307_ctrl): Add VBR.
       (no_mac): New variable.
       (m68k_extensions): Refer to no_mac mask.
.
.
.
> Regards,
> Jan
>