Status: New
Owner: ----
Labels: Type-Defect Priority-Medium
New issue 3890 by ronald.c...@visiercorp.com: "Didn't apply patch cleanly"
when using rbt post --parent in mercurial
https://code.google.com/p/reviewboard/issues/detail?id=3890
*** READ THIS BEFORE POSTING!
***
*** You must complete this form in its entirety, or your bug report will be
*** rejected.
***
*** If you have a security issue to report, please send it confidentially
to
*** secur...@reviewboard.org. Posting security-related issues to this bug
*** tracker causes us to have to do an emergency release.
***
*** For customer support, please post to reviewbo...@googlegroups.com
***
*** If you have a patch, please submit it to
http://reviews.reviewboard.org/
***
*** This bug tracker is public. Please check that any logs or other
information
*** that you include has been stripped of confidential information.
What version are you running?
site 2.0.15
rbt 0.7.4
What's the URL of the page containing the problem?
http://reviews.internal/r/67/
What steps will reproduce the problem?
1. given a mercurial repository where tip is hash AAAAA
2. make two commits locally with hash BBBBB, and CCCCC
3. rbt post --parent AAAAA
4. open in web ui and look at diff
What is the expected output? What do you see instead?
The diff from AAAAA to CCCCC.
What I see is "Didn't apply patch cleanly". Downloading the patch and
applying it locally is fine:
cd mercurial-repository
wget -Opatch http://reviews.internal/r/67/diff/raw
hg update -r AAAAA
patch -p1 < patch
Looking at the contents of the patch we see:
diff -r AAAAA -r CCCCC filename
...
The problem is "-r CCCCC", if we remove it and re-upload the patch it diffs
fine. This is a but in rbt where it is adding the "-r CCCCC"
Workaround:
rbt diff --parent AAAAA | perl -pe 's/^(diff -r \w+) -r \w+/\1/g'> patch
upload patch
This means I cannot use rbt post
What operating system are you using? What browser?
Mac OS X
Safari
Please provide any additional information below.
--
You received this message because this project is configured to send all
issue notifications to this address.
You may adjust your notification preferences at:
https://code.google.com/hosting/settings
--
You received this message because you are subscribed to the Google Groups
"reviewboard-issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to reviewboard-issues+unsubscr...@googlegroups.com.
To post to this group, send email to reviewboard-issues@googlegroups.com.
Visit this group at http://groups.google.com/group/reviewboard-issues.
For more options, visit https://groups.google.com/d/optout.
