Hi All,
I have an issue creating a review for a patch I created from a few
consecutive git commits.
I used the following command:
git format-patch --stdout --full-index 6fa2c8f..8094a86 > patch2.patch
Most of the files in the patch are visible in the review, but some of the
files have been changed in more than one commit. One of the commits for
this file is visible, but the others appear with an error "The patch to
{file_name} didn't apply cleanly":
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/reviewboard/diffviewer/views.py",
line 299, in get
response = renderer.render_to_response(request)
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/renderers.py",
line 56, in render_to_response
return HttpResponse(self.render_to_string(request))
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/renderers.py",
line 74, in render_to_string
large_data=True)
File "/usr/lib/python2.7/site-packages/djblets/cache/backend.py", line 295
, in cache_memoize
compress_large_data))
File "/usr/lib/python2.7/site-packages/djblets/cache/backend.py", line 249
, in cache_memoize_iter
items = items_or_callable()
File "/usr/lib/python2.7/site-packages/djblets/cache/backend.py", line 292
, in <lambda>
lambda: [lookup_callable()],
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/renderers.py",
line 73, in <lambda>
lambda: self.render_to_string_uncached(request),
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/renderers.py",
line 87, in render_to_string_uncached
request=request)
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/diffutils.py",
line 667, in populate_diff_chunks
chunks = list(generator.get_chunks())
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/chunk_generator.py"
, line 756, in get_chunks
for chunk in super(DiffChunkGenerator, self).get_chunks(cache_key):
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/chunk_generator.py"
, line 107, in get_chunks
large_data=True)
File "/usr/lib/python2.7/site-packages/djblets/cache/backend.py", line 295
, in cache_memoize
compress_large_data))
File "/usr/lib/python2.7/site-packages/djblets/cache/backend.py", line 249
, in cache_memoize_iter
items = items_or_callable()
File "/usr/lib/python2.7/site-packages/djblets/cache/backend.py", line 292
, in <lambda>
lambda: [lookup_callable()],
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/chunk_generator.py"
, line 106, in <lambda>
lambda: list(self.get_chunks_uncached()),
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/chunk_generator.py"
, line 763, in get_chunks_uncached
new = get_patched_file(old, self.filediff, self.request)
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/diffutils.py",
line 233, in get_patched_file
return patch(diff, buffer, filediff.dest_file, request)
File
"/usr/lib/python2.7/site-packages/reviewboard/diffviewer/diffutils.py",
line 169, in patch
'output': stderr,
Exception: The patch to '{file_name}' didn't apply cleanly. The temporary
files have been left in '/tmp/reviewboard.E5Av7z' for debugging purposes.
`patch` returned:
Is there any way to make this workflow work without squashing the commits?
Thanks,
Jonathan
--
Supercharge your Review Board with Power Pack:
https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons:
https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
---
You received this message because you are subscribed to the Google Groups
"reviewboard" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
