graphite-dev team mailing list archive

[Nicholas Leskiw <nleskiw@xxxxxxxxx>]

Can you double-check your patch file against r711? 
I can't apply that patch (4 fails at 33, 52, 76, 1290) 

Was it taken against the current version of functions.py? 
Am I doing something wrong? 

2012-02-22 14:55:55 user@host:/opt/graphite/bzr/graphite
bzr up
 M  docs/tools.rst                                                                                                                                                        
All changes applied successfully.                                                                                                                                         
Updated to revision 711 of branch bzr+ssh://bazaar.launchpad.net/%2Bbranch/graphite
2012-02-22 14:56:17 user@host:/opt/graphite/bzr/graphite
ls
bin  carbon  check-dependencies.py  conf  contrib  docs  examples  INSTALL  LICENSE  MANIFEST.in  misc  README  requirements.txt  setup.cfg  setup.py  webapp  whisper
2012-02-22 14:56:24 user@host:/opt/graphite/bzr/graphite
mv ../../preview.diff .
2012-02-22 14:56:30 user@host:/opt/graphite/bzr/graphite
patch -p1 < preview.diff 
patching file graphite/render/functions.py
Hunk #1 FAILED at 33.
Hunk #2 FAILED at 52.
Hunk #3 FAILED at 76.
Hunk #4 FAILED at 1290.
4 out of 4 hunks FAILED -- saving rejects to file graphite/render/functions.py.rej
2012-02-22 14:56:41 user@host:/opt/graphite/bzr/graphite

-- 
https://code.launchpad.net/~mleinartas/graphite/stdev/+merge/94248
Your team graphite-dev is requested to review the proposed merge of lp:~mleinartas/graphite/stdev into lp:graphite.