[darcs-users] darcs patch: issue1373 rollback rollback and fixes

Tommy Pettersson ptp at lysator.liu.se
Wed Apr 8 08:29:21 UTC 2009


On Tue, Apr 07, 2009 at 06:23:41PM +0100, Eric Kow wrote:
> I could not apply this patch bundle because darcs was complaining that
> 
> darcs: Cannot apply this patch bundle, since we're missing:
> Sat Mar 28 11:37:11 GMT 2009  Marco T�lio Gontijo e Silva <marcot at holoscopio.com>
>   * Update e-mail address for Marco T�lio Gontijo e Silva.
>   This patch includes an UTF-8 character in .authorspellings.
> 
> which it did indeed have.  So one question is if gzipping the patch
> bundle and resending it would avoid this problem.
> 
> This sort of thing has come up before...

My fault. I'm working from my laptop without a proper sendmail,
and I got the encoding wrong when I attached the patch. I've
gziped it this time to be on the safer side.

> hadoc RegChars
> --------------
> Would it be a tremendous pain for you to rename this patch to "haddock
> RegChars"?  Fixing typos in patch names is useful because it means we
> can search for them more easily later on.
[...]
> rollback rollback of hadock for Replace
> ---------------------------------------
> Another patch name typo (haddock)

It was a little pain ;-) , I had to backup a file, obliterate a
depending patch, amend, restore the backup and record the
depending patch again. But the pleasure of having searchable
patch names makes up for it, and is why I put haddock in the
name in the first place, so it would have been a waste not to
fix it.

I have from time to time been thinking of how darcs could be
made to automatically re-record depending patches when a
depended patch is amended. If it could be made to work well it
could even be used to remove dependencies by amending depended
patches so that the cause of the dependency goes away.

> rollback rollback of refactoring of Replace, and modify to disallow space
> -------------------------------------------------------------------------
> > Tommy Pettersson <ptp at lysator.liu.se>**20090406210506
> >  Ignore-this: defcc84eb4d586dd2aa1540882426773
> >  
> >  rolling back (part of):
> >  
> >  Mon Apr  6 11:38:02 CEST 2009  Eric Kow <kowey at darcs.net>
> >    * Rollback issue1373 fix, which causes a regression.
> >    More details in Tommy Pettersson's 2009-04-06 message on darcs-users,
> >    message ID <20090406091959.GA5222 at fruity>
> 
> So, I don't really care that much, but I wonder if for these kind of
> patch comments, it would make sense to snip the embedded rollbacks.
> That's what I do anyway.
> 
> >    rolling back:
> >    
> >    Sat Mar 28 10:41:48 GMT 2009  Trent W. Buck <trentbuck at gmail.com>
> >      * Resolve issue1373: make --token-chars [^ \t\n] work as advertised.
> >    
> >        M ./src/Darcs/Commands/Replace.lhs -9 +20
> >        A ./tests/issue1373_replace_token_chars.sh

Fixed all of these while I was at it.


Amended patches attached (in gzip format).


-- 
Tommy Pettersson <ptp at lysator.liu.se>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hadoc-and-issue1373.dpatch.gz
Type: application/octet-stream
Size: 40474 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20090408/ec70bcff/attachment-0001.obj>


More information about the darcs-users mailing list