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 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, showing just a Remove. This prevents combining those two events and shows two distinct actions.
New patches: [Fix issue 185: don't combine AddFile and RmFile in the same patch [EMAIL PROTECTED] 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, showing just a Remove. This prevents combining those two events and shows two distinct actions. ] 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 + | f == f' && (a /= -1 || b' /= -1) && (a' /= -1 || b /= -1) = combine ((f,a.+a',b.+b',r+r',isd,c||c'):ss) Context: [Do not run sftp with the -q flag (issue240). Eric Kow <[EMAIL PROTECTED]>**20060811212030 sftp does not recognise it, and so any command which uses it fails. ] [Refactor calls to ssh/scp/sftp. Eric Kow <[EMAIL PROTECTED]>**20060706202509 ] [Extend test suite for patch matching. Eric Kow <[EMAIL PROTECTED]>**20060513192501 ] [Implement help --match (issue91). Eric Kow <[EMAIL PROTECTED]>**20060513185610 Also, refactor matching code in a way that encourages developers to document for help --match any new matchers they create. ] [Replace dateparser.sh with more general match.pl for testing --match. Eric Kow <[EMAIL PROTECTED]>**20060513104942 ] [Add tests for pristine error and quiet mode when removing a directory. Eric Kow <[EMAIL PROTECTED]>**20060513100021] [Replace test rmdir.sh with rmdir.pl. Eric Kow <[EMAIL PROTECTED]>**20060513043823] [remove some tabs from haskell source Tommy Pettersson <[EMAIL PROTECTED]>**20060730122505] [use FastPackeString when examining executable scripts in Get Tommy Pettersson <[EMAIL PROTECTED]>**20060729130645] [add some changelog entries Tommy Pettersson <[EMAIL PROTECTED]>**20060718152611] [Minor tweaks to list_authors. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060720180602] [Fixed typo in documentation. Michal Sojka <[EMAIL PROTECTED]>**20060514095212] [Added elc and pyc to binaries. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060713184214] [Run ssh/scp/sftp quietly. Eric Kow <[EMAIL PROTECTED]>**20060707025245 This is useful for silencing Putty, and could also be for OpenSSH should we decide to stop redirecting to /dev/null. ] [Added up links in web interface. Peter Stuifzand <[EMAIL PROTECTED]>**20060610082238 Added a link to the 'projects' part of the cgi repository interface, so that you go back to the project list. ] [Add a test suite for calling external programs. Eric Kow <[EMAIL PROTECTED]>**20060521045407 For now this only includes a test for ssh (issue171). ] [Suppress non-empty dir warning if Quiet. Eric Kow <[EMAIL PROTECTED]>**20060513053456] [Add forgotten file umask.h. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060423174844] [Add --umask to all commands that write to the current repository. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060407195655] [Add option --umask. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060407194552] [Actually switch umasks in withRepoLock. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060407194202] [Implement withUMask. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060407193312] [Add umask.c. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060407193255] [Propagate opts to withRepoLock. Juliusz Chroboczek <[EMAIL PROTECTED]>**20060325190622] [TAG 1.0.8 Tommy Pettersson <[EMAIL PROTECTED]>**20060616160213] Patch bundle hash: fb66f664b5eee8e1e2cb281cba1330fbf6c54f37
_______________________________________________ darcs-devel mailing list [email protected] http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
