Jon, thanks so much. I'd been using 'svn diff' but 'git format-patch' works great with Review Board.
Bright On Tue, Oct 18, 2011 at 7:49 PM, Jonathan Hsieh <[email protected]> wrote: > Hey Bright, > > I've always had problems when getting patches up to review board when using > plain diff generated patch files -- I've only gotten it to work once or > twice and can never figure out the proper base directory thing. (which is > what I think the eror message you are showing is complaining about). > > Assuming you are using git and have a single committed patch which is your > current branch, I've found using git's 'git format-patch HEAD^' and using > the generated file with the 'hbase-git' project to be the easiest. The file > name generated should start with 0001-HBASE-xxxxx.patch. > > Jon. > > On Wed, Oct 12, 2011 at 3:23 PM, Ted Yu <[email protected]> wrote: > >> Hi, >> Can someone share experience on how we can use review board for HBase 0.90 >> ? >> >> Thanks >> >> ---------- Forwarded message ---------- >> From: Bright Fulton <[email protected]> >> Date: Wed, Oct 12, 2011 at 3:19 PM >> Subject: Fwd: Review Request: HBASE-4508: Backport HBASE-3777 to 0.90 >> branch >> To: Ted Yu <[email protected]> >> >> >> I'm getting problems with the View Diff tab. Is there a Review Board trick >> I don't know? >> >> >> https://reviews.apache.org/r/2192/diff/#index_header >> >> The patch to './src/main/java/org/apache/hadoop/hbase/HConstants.java' >> didn't apply cleanly. The temporary files have been left in >> '/tmp/reviewboard.4OQ0wF' for debugging purposes. `patch` returned: >> patching >> file /tmp/reviewboard.4OQ0wF/tmp1RuVzC Reversed (or previously applied) >> patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 2 out of 2 >> hunks ignored -- saving rejects to file >> /tmp/reviewboard.4OQ0wF/tmp1RuVzC-new.rej >> >> Traceback (most recent call last): >> File >> "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.5.5-py2.6.egg/reviewboard/diffviewer/views.py", >> line 153, in view_diff >> interdiffset, highlighting, True) >> File >> "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.5.5-py2.6.egg/reviewboard/diffviewer/diffutils.py", >> line 1066, in get_diff_files >> large_data=True) >> File >> "/usr/local/lib/python2.6/dist-packages/Djblets-0.6.7-py2.6.egg/djblets/util/misc.py", >> line 166, in cache_memoize >> data = lookup_callable() >> File >> "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.5.5-py2.6.egg/reviewboard/diffviewer/diffutils.py", >> line 1065, in <lambda> >> enable_syntax_highlighting)), >> File >> "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.5.5-py2.6.egg/reviewboard/diffviewer/diffutils.py", >> line 552, in get_chunks >> new = get_patched_file(old, filediff) >> File >> "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.5.5-py2.6.egg/reviewboard/diffviewer/diffutils.py", >> line 374, in get_patched_file >> return patch(filediff.diff, buffer, filediff.dest_file) >> File >> "/usr/local/lib/python2.6/dist-packages/ReviewBoard-1.5.5-py2.6.egg/reviewboard/diffviewer/diffutils.py", >> line 242, in patch >> (filename, tempdir, patch_output)) >> Exception: The patch to >> './src/main/java/org/apache/hadoop/hbase/HConstants.java' didn't apply >> cleanly. The temporary files have been left in >> '/tmp/reviewboard.4OQ0wF' for debugging purposes. >> `patch` returned: patching file /tmp/reviewboard.4OQ0wF/tmp1RuVzC >> Reversed (or previously applied) patch detected! Assume -R? [n] >> Apply anyway? [n] >> Skipping patch. >> 2 out of 2 hunks ignored -- saving rejects to file >> /tmp/reviewboard.4OQ0wF/tmp1RuVzC-new.rej >> >> >> >> >> ---------- Forwarded message ---------- >> From: Bright Fulton <[email protected]> >> Date: Wed, Oct 12, 2011 at 6:16 PM >> Subject: Review Request: HBASE-4508: Backport HBASE-3777 to 0.90 branch >> To: Ted Yu <[email protected]> >> Cc: Bright Fulton <[email protected]> >> >> >> This is an automatically generated e-mail. To reply, visit: >> https://reviews.apache.org/r/2192/ >> Review request for Ted Yu. >> By Bright Fulton. >> Description >> >> A backport of HBASE-3777 to the 0.90 branch, preserving 0.90 >> connection-per-config behavior by introducing the (default true) >> hbase.connection.per.config config property. >> >> *Bugs: * HBASE-4508 <https://issues.apache.org/jira/browse/HBASE-4508> >> Diffs >> >> - >> ./src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java >> (1179055) >> - >> ./src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java >> (1179055) >> - ./src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java >> (1179055) >> - ./src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java >> (1179055) >> - >> ./src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java >> (1179055) >> - ./src/test/java/org/apache/hadoop/hbase/client/TestHCM.java (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java >> (1179055) >> - ./src/main/resources/hbase-default.xml (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/master/HMaster.java (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/master/ServerManager.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java >> (1179055) >> - >> ./src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java >> (1179055) >> - >> ./src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/util/HMerge.java (1179055) >> - >> ./src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java >> (1179055) >> - >> ./src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java >> (1179055) >> - >> ./src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/client/MetaScanner.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/client/HTablePool.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/client/HTable.java (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/client/HConnection.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java >> (1179055) >> - ./src/main/java/org/apache/hadoop/hbase/HConstants.java (1179055) >> >> View Diff <https://reviews.apache.org/r/2192/diff/> >> > > > > -- > // Jonathan Hsieh (shay) > // Software Engineer, Cloudera > // [email protected] >
