Re: Problem with merge

[Phil Muldoon <pmuldoon at redhat dot com>]

Phil Muldoon wrote:
> Rick Moseley wrote:
>
> ... and GDB never returns (well "never" being more than 1 hour in this 
> test).

Ack sorry forgot to append the rest of my notes:

When I reset the HEAD to:

[pmuldoon@localhost archer] git-reset --hard 
17e2fe2f5e5729fde29f6a66c9cb84ca1fa3fb31

commit 17e2fe2f5e5729fde29f6a66c9cb84ca1fa3fb31
Author: Rick Moseley <rmoseley@localhost.localdomain>
Date:   Thu Dec 11 18:54:42 2008 -0600

   Additional change for archer-tromey-delayed-symfile.

The break.exp test passes with:

[pmuldoon@localhost testsuite] runtest gdb.base/break.exp

<snip>

Running ../../../rick_issue/archer/gdb/testsuite/gdb.base/break.exp ...

       === gdb Summary ===

# of expected passes        81
/home/pmuldoon/rick_issue_obj/gdb/testsuite/../../gdb/gdb version  
6.8.50.20081125-cvs -nw -nx

So that was then the test was last passing. But when I reset to the very 
next commit/merge:

[pmuldoon@localhost ~] tar zxvf rick_issue.tar.gz
[pmuldoon@localhost ~] cd rick_issue/archer

[pmuldoon@localhost archer] git-reset --hard 
cd8b25df41e5a4b25e15e6a3e3c9f71f60be613a

commit cd8b25df41e5a4b25e15e6a3e3c9f71f60be613a
Merge: 17e2fe2... b5e88c1...
Author: Rick Moseley <rmoseley@dhcp-215.hsv.redhat.com>
Date:   Tue Dec 16 14:37:37 2008 -0600

   Merge branch 'archer-sergio-catch-syscall' of 
ssh://sources.redhat.com/git/archer into archer-rmoseley-demo-merge
  
   Conflicts:
  
       gdb/Makefile.in
       gdb/breakpoint.c
       gdb/breakpoint.h

The test fails with the results you describe. So there was a 
merge/conflict oops there or something?