<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><div>On 28 Sep 2012, at 2:29 AM, Adrian Buehlmann wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>On 2012-09-28 08:42, Adrian Buehlmann wrote:<br><blockquote type="cite">On 2012-09-28 00:22, Adrian Buehlmann wrote:<br></blockquote><blockquote type="cite"><blockquote type="cite"># HG changeset patch<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"># User Adrian Buehlmann <<a href="mailto:adrian@cadifra.com">adrian@cadifra.com</a>><br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"># Date 1348784063 -7200<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"># Node ID 3b6ae776f29c3d6e678d3b734fabddb06b1f0936<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite"># Parent 68a3d36c2c29172e279fe6ccadc360fa7e7bad42<br></blockquote></blockquote><blockquote type="cite"><blockquote type="cite">V10 of experiment for a simpler path encoding for hashed paths (for "fncache2")<br></blockquote></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">dogfooding fun:<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">I qpop'ed my queue, pulled from main, and updated.<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite">Now I can't qpush this patch any more:<br></blockquote><blockquote type="cite"><br></blockquote><blockquote type="cite"> $ hg --traceback -v qpush<br></blockquote><blockquote type="cite"> applying abuehl.pe3.diff<br></blockquote><blockquote type="cite"> unable to strip away 1 of 1 dirs from C:\Users\adi\hgrepos\hg-main\tests\test-hybridencode.py.out<br></blockquote><blockquote type="cite"> Traceback (most recent call last):<br></blockquote><blockquote type="cite"> File "C:\Users\adi\hgrepos\hg-main\hgext\mq.py", line 688, in patch<br></blockquote><blockquote type="cite"> files=files, eolmode=None)<br></blockquote><blockquote type="cite"> File "C:\Users\adi\hgrepos\hg-main\mercurial\patch.py", line 1492, in patch<br></blockquote><blockquote type="cite"> raise util.Abort(str(err))<br></blockquote><blockquote type="cite"> Abort: unable to strip away 1 of 1 dirs from C:\Users\adi\hgrepos\hg-main\tests\test-hybridencode.py.out<br></blockquote><blockquote type="cite"> patch failed, rejects left in working dir<br></blockquote><blockquote type="cite"> errors during apply, please fix and refresh abuehl.pe3.diff<br></blockquote><br>That's what you get for pasting a diff into a change message (and<br>forgetting that this is a bad idea :-)<br></div></blockquote><div><br></div><div>Incidentally, if one does find the need to do so, what's the safe way? Indent the whole diff by one space?</div></div><br><div>
<span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-family: Helvetica; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; font-size: medium; ">pacem in terris / мир / शान्ति / سَلاَم / 平和<br>Kevin R. Bullock</span>
</div>
<br></body></html>