On 02/12/2011 10:13 PM, Oz Linden wrote:
> (there is a failure displaying the diff for autobuild.configfile.py because
> it is a one word change of the logging level for a log message added by one
> of my other changes that has not yet been applied to the trunk)
You should be able use the 'Parent Diff' feature to let RB know about
your other changes that have "not yet been applied to the trunk",
without having it mix them into the diff to review.
Here's how I think the procedure will work in detail:
1. Identify a revision that is in the repo you chose when creating
the review request^[1] <#footnote1> *and* present in your local
repository. I will call that revision 'common_base' from here on.
* If in doubt, pull from the chosen remote repository, so
you'll have the tip in common and can use that as
common_base. (I don't think common_base actually has to be a
common ancestor of the remote's tip and the revision you
want reviewed.)
2. Identify the revision that the change to be reviewed is based on.
Let's call it 'begin'.
3. Save the diff from common_base to begin as parent.diff:
hg diff -r common_base -r begin > parent.diff
* Of course, substitute the revisions identified above for
common_base and begin, respectively.
4. I'll assume you still have the diff you uploaded when creating the
review. I not, get it from
https://codereview.secondlife.com/r/150/diff/raw/ (or click the
*Download Diff* button)
* This diff should apply cleanly on the begin revision
5. On https://codereview.secondlife.com/r/150/, click *Update Diff*
6. In the *Diff* field, choose the diff you already uploaded when
creating the review
7. In the *Parent Diff* field, choose the new parent.diff file
8. Click *Upload*
------------------------------------------------------------------------
^[1] <#footnote1_back> In your case, the one referenced by
'03_autobuild', so probably
https://bitbucket.org/mani_linden/viewer-autobuild
Cheers,
Boroondas
_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/OpenSource-Dev
Please read the policies before posting to keep unmoderated posting privileges
