Re: [m5-dev] Error in uploading diff
Yes it does. The easiest way to use it is the hg postreview plugin that integates with mercurial and you won't have any issues. Ali Sent from my ARM powered device On Dec 23, 2010, at 1:49 AM, Nilay ni...@cs.wisc.edu wrote: Apparently Review Board requires git-styled diffs. On Wed, December 22, 2010 8:34 pm, nathan binkert wrote: I don't have time to look at it right now, but I've attached the directory that the error message is referring to. On Wed, Dec 22, 2010 at 6:22 PM, Nilay Vaish ni...@cs.wisc.edu wrote: Can some one try applying the attached diff? It touches only src/mem/protocol/MOESI_CMP_directory-* files. Review Board is failing in applying this diff. I tried and it works correctly. This is the output from Review Board -- The patch to 'src/mem/protocol/MOESI_CMP_directory-L1cache.sm' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.3s7DQ8' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.3s7DQ8/tmpAp0ogH Hunk #1 succeeded at 6 with fuzz 2 (offset -130 lines). Hunk #2 FAILED at 150. Hunk #3 FAILED at 184. Hunk #4 FAILED at 272. Hunk #5 FAILED at 289. Hunk #6 FAILED at 306. Hunk #7 FAILED at 335. Hunk #8 FAILED at 353. Hunk #9 FAILED at 373. Hunk #10 FAILED at 380. Hunk #11 FAILED at 393. Hunk #12 FAILED at 425. Hunk #13 FAILED at 440. Hunk #14 FAILED at 479. Hunk #15 FAILED at 493. Hunk #16 FAILED at 511. Hunk #17 FAILED at 529. Hunk #18 FAILED at 543. Hunk #19 FAILED at 597. Hunk #20 FAILED at 604. Hunk #21 FAILED at 640. Hunk #22 FAILED at 655. Hunk #23 FAILED at 676. Hunk #24 FAILED at 690. Hunk #25 FAILED at 708. Hunk #26 FAILED at 721. Hunk #27 FAILED at 739. Hunk #28 FAILED at 768. Hunk #29 FAILED at 780. Hunk #30 FAILED at 1180. 29 out of 30 hunks FAILED -- saving rejects to file /tmp/reviewboard.3s7DQ8/tmpAp0ogH-new.rej Do you think some thing is wrong with the diff? Thanks Nilay ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev -- Nilay ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
Re: [m5-dev] Error in uploading diff
I don't have time to look at it right now, but I've attached the directory that the error message is referring to. On Wed, Dec 22, 2010 at 6:22 PM, Nilay Vaish ni...@cs.wisc.edu wrote: Can some one try applying the attached diff? It touches only src/mem/protocol/MOESI_CMP_directory-* files. Review Board is failing in applying this diff. I tried and it works correctly. This is the output from Review Board -- The patch to 'src/mem/protocol/MOESI_CMP_directory-L1cache.sm' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.3s7DQ8' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.3s7DQ8/tmpAp0ogH Hunk #1 succeeded at 6 with fuzz 2 (offset -130 lines). Hunk #2 FAILED at 150. Hunk #3 FAILED at 184. Hunk #4 FAILED at 272. Hunk #5 FAILED at 289. Hunk #6 FAILED at 306. Hunk #7 FAILED at 335. Hunk #8 FAILED at 353. Hunk #9 FAILED at 373. Hunk #10 FAILED at 380. Hunk #11 FAILED at 393. Hunk #12 FAILED at 425. Hunk #13 FAILED at 440. Hunk #14 FAILED at 479. Hunk #15 FAILED at 493. Hunk #16 FAILED at 511. Hunk #17 FAILED at 529. Hunk #18 FAILED at 543. Hunk #19 FAILED at 597. Hunk #20 FAILED at 604. Hunk #21 FAILED at 640. Hunk #22 FAILED at 655. Hunk #23 FAILED at 676. Hunk #24 FAILED at 690. Hunk #25 FAILED at 708. Hunk #26 FAILED at 721. Hunk #27 FAILED at 739. Hunk #28 FAILED at 768. Hunk #29 FAILED at 780. Hunk #30 FAILED at 1180. 29 out of 30 hunks FAILED -- saving rejects to file /tmp/reviewboard.3s7DQ8/tmpAp0ogH-new.rej Do you think some thing is wrong with the diff? Thanks Nilay ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev reviewboard.3s7DQ8.tar.gz Description: GNU Zip compressed data ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
Re: [m5-dev] Error in uploading diff
Apparently Review Board requires git-styled diffs. On Wed, December 22, 2010 8:34 pm, nathan binkert wrote: I don't have time to look at it right now, but I've attached the directory that the error message is referring to. On Wed, Dec 22, 2010 at 6:22 PM, Nilay Vaish ni...@cs.wisc.edu wrote: Can some one try applying the attached diff? It touches only src/mem/protocol/MOESI_CMP_directory-* files. Review Board is failing in applying this diff. I tried and it works correctly. This is the output from Review Board -- The patch to 'src/mem/protocol/MOESI_CMP_directory-L1cache.sm' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.3s7DQ8' for debugging purposes. `patch` returned: patching file /tmp/reviewboard.3s7DQ8/tmpAp0ogH Hunk #1 succeeded at 6 with fuzz 2 (offset -130 lines). Hunk #2 FAILED at 150. Hunk #3 FAILED at 184. Hunk #4 FAILED at 272. Hunk #5 FAILED at 289. Hunk #6 FAILED at 306. Hunk #7 FAILED at 335. Hunk #8 FAILED at 353. Hunk #9 FAILED at 373. Hunk #10 FAILED at 380. Hunk #11 FAILED at 393. Hunk #12 FAILED at 425. Hunk #13 FAILED at 440. Hunk #14 FAILED at 479. Hunk #15 FAILED at 493. Hunk #16 FAILED at 511. Hunk #17 FAILED at 529. Hunk #18 FAILED at 543. Hunk #19 FAILED at 597. Hunk #20 FAILED at 604. Hunk #21 FAILED at 640. Hunk #22 FAILED at 655. Hunk #23 FAILED at 676. Hunk #24 FAILED at 690. Hunk #25 FAILED at 708. Hunk #26 FAILED at 721. Hunk #27 FAILED at 739. Hunk #28 FAILED at 768. Hunk #29 FAILED at 780. Hunk #30 FAILED at 1180. 29 out of 30 hunks FAILED -- saving rejects to file /tmp/reviewboard.3s7DQ8/tmpAp0ogH-new.rej Do you think some thing is wrong with the diff? Thanks Nilay ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev -- Nilay ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
