Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-14 Thread Kamesh Jayachandran
On 03/14/2011 06:11 PM, Arwin Arni wrote: On Monday 14 March 2011 11:40 AM, Arwin Arni wrote: On Monday 14 March 2011 02:47 AM, Daniel Becroft wrote: On Mon, Mar 14, 2011 at 7:06 AM, Daniel Becroft mailto:djcbecr...@gmail.com>> wrote: On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato mai

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-14 Thread Arwin Arni
On Monday 14 March 2011 11:40 AM, Arwin Arni wrote: On Monday 14 March 2011 02:47 AM, Daniel Becroft wrote: On Mon, Mar 14, 2011 at 7:06 AM, Daniel Becroft > wrote: On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato mailto:cmpil...@collab.net>> wrote: O

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-13 Thread Arwin Arni
On Monday 14 March 2011 02:47 AM, Daniel Becroft wrote: On Mon, Mar 14, 2011 at 7:06 AM, Daniel Becroft > wrote: On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato mailto:cmpil...@collab.net>> wrote: On 03/11/2011 10:03 AM, Arwin Arni wrote:

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-13 Thread Daniel Becroft
On Mon, Mar 14, 2011 at 7:06 AM, Daniel Becroft wrote: > On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato wrote: > >> On 03/11/2011 10:03 AM, Arwin Arni wrote: >> > Index: ../subversion/tests/cmdline/merge_tests.py >> > === >> > ---

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-13 Thread Daniel Becroft
On Sat, Mar 12, 2011 at 1:50 AM, C. Michael Pilato wrote: > On 03/11/2011 10:03 AM, Arwin Arni wrote: > > Index: ../subversion/tests/cmdline/merge_tests.py > > === > > --- ../subversion/tests/cmdline/merge_tests.py(revision 1

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-11 Thread C. Michael Pilato
On 03/11/2011 10:03 AM, Arwin Arni wrote: > Index: ../subversion/tests/cmdline/merge_tests.py > === > --- ../subversion/tests/cmdline/merge_tests.py(revision 1080126) > +++ ../subversion/tests/cmdline/merge_tests.py(wor

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-11 Thread C. Michael Pilato
I'm having trouble getting the patch to apply cleanly, but don't sweat it -- I'll apply it by hand. On 03/11/2011 10:03 AM, Arwin Arni wrote: > On Friday 11 March 2011 08:26 PM, Arwin Arni wrote: >> Hi All, >> >> This patch adds a test to make sure that conflict resolution files are not >> created

Re: [PATCH] Add a test to cover the regression introduced in r1075802

2011-03-11 Thread Arwin Arni
On Friday 11 March 2011 08:26 PM, Arwin Arni wrote: Hi All, This patch adds a test to make sure that conflict resolution files are not created in the event of a *dry-run* merge that has binary file conflicts. The relevant discussion on dev@ is here -> http://svn.haxx.se/dev/archive-2011-03/

[PATCH] Add a test to cover the regression introduced in r1075802

2011-03-11 Thread Arwin Arni
Hi All, This patch adds a test to make sure that conflict resolution files are not created in the event of a *dry-run* merge that has binary file conflicts. The relevant discussion on dev@ is here -> http://svn.haxx.se/dev/archive-2011-03/0145.shtml Regards, Arwin Arni