Re: [C++] Patches TUSCANY-606 and 613, was: BigBank scenario working end to end

2006-08-14 Thread Andrew Borley

No problem, I've put a new patch up at TUSCANY-613 from the latest code
revision. This includes the 606 update, so no need to update that one.

Cheers
Andy


On 8/12/06, Jean-Sebastien Delfino [EMAIL PROTECTED] wrote:


Andrew Borley wrote:
[snip]
 I needed to update the deploy.bat file that puts the various files in
 the right places in the samples/BigBank/deploy directory so I've put a
 patch up at TUSCANY-606.

Andy,

I am not able to apply patch TUSCANY-606 (and similar problem with
TUSCANY-613).

patch -p0 /home/delfinoj/Tuscany/patches/TUSCANY-606.patch
gives me this error:
(Stripping trailing CRs from patch.)
patching file sca/samples/BigBank/deploy.bat
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
sca/samples/BigBank/deploy.bat.rej

I have no idea what 1 out of 1 hunk failed means :) but svn info
deploy.bat tells me: Last Changed Rev 429833, and the patch was
generated on an earlier revision 429611... Could this be the problem?

Sorry about the inconvenience but could you try svn up then svn diff
again and attach new patches to the JIRA issues? I'll try applying them
again... Thanks.

--
Jean-Sebastien


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




Re: [C++] Patches TUSCANY-606 and 613, was: BigBank scenario working end to end

2006-08-14 Thread Pete Robbins

patch applied

On 14/08/06, Andrew Borley [EMAIL PROTECTED] wrote:


No problem, I've put a new patch up at TUSCANY-613 from the latest code
revision. This includes the 606 update, so no need to update that one.

Cheers
Andy


On 8/12/06, Jean-Sebastien Delfino [EMAIL PROTECTED] wrote:

 Andrew Borley wrote:
 [snip]
  I needed to update the deploy.bat file that puts the various files in
  the right places in the samples/BigBank/deploy directory so I've put a
  patch up at TUSCANY-606.
 
 Andy,

 I am not able to apply patch TUSCANY-606 (and similar problem with
 TUSCANY-613).

 patch -p0 /home/delfinoj/Tuscany/patches/TUSCANY-606.patch
 gives me this error:
 (Stripping trailing CRs from patch.)
 patching file sca/samples/BigBank/deploy.bat
 Hunk #1 FAILED at 1.
 1 out of 1 hunk FAILED -- saving rejects to file
 sca/samples/BigBank/deploy.bat.rej

 I have no idea what 1 out of 1 hunk failed means :) but svn info
 deploy.bat tells me: Last Changed Rev 429833, and the patch was
 generated on an earlier revision 429611... Could this be the problem?

 Sorry about the inconvenience but could you try svn up then svn diff
 again and attach new patches to the JIRA issues? I'll try applying them
 again... Thanks.

 --
 Jean-Sebastien


 -
 To unsubscribe, e-mail: [EMAIL PROTECTED]
 For additional commands, e-mail: [EMAIL PROTECTED]







--
Pete


[C++] Patches TUSCANY-606 and 613, was: BigBank scenario working end to end

2006-08-11 Thread Jean-Sebastien Delfino

Andrew Borley wrote:
[snip]

I needed to update the deploy.bat file that puts the various files in
the right places in the samples/BigBank/deploy directory so I've put a
patch up at TUSCANY-606.


Andy,

I am not able to apply patch TUSCANY-606 (and similar problem with 
TUSCANY-613).


patch -p0 /home/delfinoj/Tuscany/patches/TUSCANY-606.patch
gives me this error:
(Stripping trailing CRs from patch.)
patching file sca/samples/BigBank/deploy.bat
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file 
sca/samples/BigBank/deploy.bat.rej


I have no idea what 1 out of 1 hunk failed means :) but svn info 
deploy.bat tells me: Last Changed Rev 429833, and the patch was 
generated on an earlier revision 429611... Could this be the problem?


Sorry about the inconvenience but could you try svn up then svn diff 
again and attach new patches to the JIRA issues? I'll try applying them 
again... Thanks.


--
Jean-Sebastien


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]