1959: Looking for a list of DIFF file settings - using Mercurial 1.7.3

steve.******@gmai***** (Google Code) (Is this you? Claim this profile.)
May 13, 2011 
What version are you running? 1.52


What's the URL of the page containing the problem?
locally - http://10.91.134.30/r/11/diff/#index_header


What steps will reproduce the problem?
1. Create a diff (using hg export, hg postreview extension or post-review
2.  upload diff/patch to reviewboard
3.  view anything but the simplest diff and receive "Exception: The patch to ... didn't apply cleanly...."

What is the expected output? What do you see instead?
Expected to see a Diff view in ReviewBoard, instead get the Exception listed above

What operating system are you using? What browser?
Ubuntu 10.10 and Windows 7 64 bit

Please provide any additional information below.
It appears that the bug is because the diff file format is different than what RB is expecting.  I have better luck creating reviews on Ubuntu than Windows 7, but it's still very spotty on linux.

It looks/feels like RB has a defined set of expectations on the diff file format, but I can't find these documented anywhere.  Can anyone point me a documented list of settings?  Thank you,

-Steve
chipx86
#1 chipx86 
We expect a unified diff in a format that our tools can parse. A Mercurial diff *should* be working.

What would be helpful is to see a sample diff that causes this problem, and then see the files in the tmp directory listed during the "Patch didn't apply cleanly" error. There should be a .rej file in there that may help determine things.

One thing that you may want to make sure of is that the revision your diff uses as a base can be found in the repository that Review Board is configured to access. If your diff is using a branch as a base and that branch isn't in the upstream repository, you'll need to provide a parent diff. I don't have experience with 'hg postreview', but standard post-review has a --parent=<branchname> option that's used for that purpose. I imagine 'hg postreview' has something similar. That option will generate a diff between some upstream revision and the branch you specify, and use that as a base to apply your new diff onto.
  • -Type-Defect
    +Type-Support
david
#2 david 
Have you made any progress here? If not, can you provide more information, such as what the rejections are?
  • +NeedInfo
david
#3 david
  • -NeedInfo
    +Incomplete