[PATCH] V10 of experiment for a simpler path encoding for hashed paths (for "fncache2")

Kevin Bullock kbullock+mercurial at ringworld.org
Fri Sep 28 09:39:56 CDT 2012


On 28 Sep 2012, at 2:29 AM, Adrian Buehlmann wrote:

> On 2012-09-28 08:42, Adrian Buehlmann wrote:
>> On 2012-09-28 00:22, Adrian Buehlmann wrote:
>>> # HG changeset patch
>>> # User Adrian Buehlmann <adrian at cadifra.com>
>>> # Date 1348784063 -7200
>>> # Node ID 3b6ae776f29c3d6e678d3b734fabddb06b1f0936
>>> # Parent  68a3d36c2c29172e279fe6ccadc360fa7e7bad42
>>> V10 of experiment for a simpler path encoding for hashed paths (for "fncache2")
>> 
>> dogfooding fun:
>> 
>> I qpop'ed my queue, pulled from main, and updated.
>> 
>> Now I can't qpush this patch any more:
>> 
>>  $ hg --traceback -v qpush
>>  applying abuehl.pe3.diff
>>  unable to strip away 1 of 1 dirs from C:\Users\adi\hgrepos\hg-main\tests\test-hybridencode.py.out
>>  Traceback (most recent call last):
>>    File "C:\Users\adi\hgrepos\hg-main\hgext\mq.py", line 688, in patch
>>      files=files, eolmode=None)
>>    File "C:\Users\adi\hgrepos\hg-main\mercurial\patch.py", line 1492, in patch
>>      raise util.Abort(str(err))
>>  Abort: unable to strip away 1 of 1 dirs from C:\Users\adi\hgrepos\hg-main\tests\test-hybridencode.py.out
>>  patch failed, rejects left in working dir
>>  errors during apply, please fix and refresh abuehl.pe3.diff
> 
> That's what you get for pasting a diff into a change message (and
> forgetting that this is a bad idea :-)

Incidentally, if one does find the need to do so, what's the safe way? Indent the whole diff by one space?

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120928/9e15485e/attachment.html>


More information about the Mercurial-devel mailing list