Christian Hammond wrote:
What you could do now is modify postreview.py so that the CVSClient instance is created before the ClearCaseClient. That would guarantee that CVS would check first.


An easy technique for dealing with this is to add another definition for SCMCLIENTS, this way if the SCMCLIENTS is ever changed upstream it is still possible to automatically merge your diffs without a manual conflict resolution, e.g.immediate after SCMCLIENTS:



SCMCLIENTS = (
   SVNClient(),
   CVSClient(),
   GitClient(),
   MercurialClient(),
   PerforceClient(),
   ClearCaseClient(),
)

####################################################################

### re-define SCMCLIENTS, this makes merging changes easier (than customizing SCMCLIENTS) :-)
SCMCLIENTS = (
   SVNClient(),
   PiccoloClient(),
)
####################################################################

Sort of brute force but it works :-)

Chris

--
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~----------~----~----~----~------~----~------~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

Reply via email to