Re: Unusual merge result

2010-10-20 Thread Tony Butt
Johan, On Tue, 2010-10-19 at 11:59 +0200, Johan Corveleyn wrote: > On Tue, Oct 19, 2010 at 9:40 AM, Tony Butt wrote: > > On Tue, 2010-10-19 at 18:23 +1100, Tony Butt wrote: > >> I have had 2 unusual occurrences with merges with some of our software > >> engineers here in the last month. I wrote th

Re: Unusual merge result

2010-10-19 Thread Johan Corveleyn
On Tue, Oct 19, 2010 at 9:40 AM, Tony Butt wrote: > On Tue, 2010-10-19 at 18:23 +1100, Tony Butt wrote: >> I have had 2 unusual occurrences with merges with some of our software >> engineers here in the last month. I wrote the first off as user error, >> but a similar event has occurred - still po

Re: Unusual merge result

2010-10-19 Thread Tony Butt
On Tue, 2010-10-19 at 18:23 +1100, Tony Butt wrote: > I have had 2 unusual occurrences with merges with some of our software > engineers here in the last month. I wrote the first off as user error, > but a similar event has occurred - still possibly user error. > > We are using subversion 1.6.12 o