Re: [darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-31 Thread Juliusz Chroboczek
> Sun Aug 20 02:40:24 CEST 2006 [EMAIL PROTECTED] > * Fix issue 185: don't combine AddFile and RmFile in the same patch Already committed in the *unstable* branch (you appear to be working with the stable one). Juliusz __

[darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-31 Thread lele
Sun Aug 20 02:40:24 CEST 2006 [EMAIL PROTECTED] * Fix issue 185: don't combine AddFile and RmFile in the same patch For unknown reason (a possibly previous version of) darcs allows a single patch to Add and Remove the same file in a single patch. The "changes" command used to combine them

Re: [darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-31 Thread Juliusz Chroboczek
> Now the question is: what's better, amending my change and resend a > new patch, or recording this fix a sending an additional patch with > the correct condition? Please send a new patch. Juliusz ___ darcs-deve

[darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-19 Thread lele
This is the amended patch, with the correct condition, as explained in my previous message. Of course, if the previous patch has been already applied, I can easily send a new fix-to-fix patch instead. Sorry for the noise. Sun Aug 20 02:40:24 CEST 2006 [EMAIL PROTECTED] * Fix issue 185: don't co

Re: [darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-19 Thread Lele Gaifax
[EMAIL PROTECTED] wrote: hunk ./PatchViewing.lhs 173 - | f == f' = combine ((f,a.+a',b.+b',r+r',isd,c||c'):ss) + -- Don't combine AddFile and RmFile: (maybe an old revision of) darcs + -- allows a single patch to add and remove the same file, see issue 185

Re: [darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-19 Thread Eric Y. Kow
> Sat Aug 19 19:54:49 CEST 2006 [EMAIL PROTECTED] > * Fix issue 185: don't combine AddFile and RmFile in the same patch > For unknown reason (a possibly previous version of) darcs allows a > single patch to Add and Remove the same file in a single patch. The > "changes" command used to co

[darcs-devel] darcs patch: Fix issue 185: don't combine AddFile and RmFile in the...

2006-08-19 Thread lele
Sat Aug 19 19:54:49 CEST 2006 [EMAIL PROTECTED] * Fix issue 185: don't combine AddFile and RmFile in the same patch For unknown reason (a possibly previous version of) darcs allows a single patch to Add and Remove the same file in a single patch. The "changes" command used to combine them