visual studio - Code Review Workflow + Feature Branching in TFS -


we starting work feature branches , want set check-in policy allows check-ins baseline when have associated code review.

the new code review workflow in 2012 quite nice, since can interact developer , other reviewers, , comment lines of code directly. nevertheless seems ms didn't think use case because run following problem:

  1. the developer works on feature branch checking-in/shelving , forward-integrating regularly.

  2. when wants integrate feature, merges baseline , requests review on these pending changes.

  3. the reviewer makes several comments , has change code. this?

option 1: go branch, edit code , check-in changes in branch. undo pending changes of first merge. merge , request review again. repeat until there no more comments. check-in merge. not nice because review comments in pending changes of merge, , has work on branch doesn't see comments directly.

option 2: make edits directly on pending changes of merge. request review again. repeat until there no more comments. check-in merge. if wants continue working on branch, have make forward integration because changes review not there.

either way, second review annoying, because have no way of seeing changes between first , second review, since diff-ing baseline.

am missing here? there option allows reviewing changes review? have better way of feature branching , code reviewing?

new: using vs , tfs2013, still no improvements :(

you're not missing anything. unfortunate problem associated way code reviews implemented, can linked 1 changeset, not range of changes.

if team used high frequency of checkins on feature branches, having every individual changeset reviewed using tool may lot of overhead. recommendation.

there trick, it's not ideal, may help. can check out (on feature branch) files changed since last checkin. request review. create shelveset changes , associate review. way don't have perform merge prior requesting review. make sure merge latest version main feature branch before pulling trick. there 2 major drawbacks this:

  1. while changed files linked review, changes since last review won't highlighted automatically. reviewer have manually "compare version" , pick compare target.
  2. there limit of 4000 (from top of head) files can associated review, may pose limit files can review group (i hope you're not changing 4000+ files between integrations main).

Comments