Workflow not supported ?

[Mark de Roussier]

Hi folk,

I'm using git, and have a workflow which wants to perform a review on my local commits to branch X ( diffed against the last commit to branch X that's present in the remote ), and the result of an approved change is to then merge and push those local commits to the remote.

It's not clear to me that this fits with the Review Board concept of 'landing'. So far, I've not found a way to make Review Board work in this way. Anyone know if this is possible ?

Thanks,

Mark de Roussier

[David Trowbridge]

Mark,

`rbt land` does assume that your working branch has a different name than your tracking branch--that is, that you'd have origin/X, X, and then some local-only named branch. `rbt land` would then handle stamping and merging from local-only to X (and optionally pushing). We've found that's usually a safer workflow than committing straight to X, because it avoids unintentional pushes of unreviewed/in-progress code, and makes it easier to keep a clean commit history (if you're working directly on X, pulling will create merges, whereas if you have a topic branch you can choose to rebase or merge depending on your goals and preferences). Having a history full of merges can make it pretty difficult if you're trying to bisect to find a breaking change, and can sometimes make diffs on Review Board confusing.

That said, you don't need to use rbt land. If you really want to have people work directly on their local X branch, you can use `rbt post origin/X..HEAD` to post the in-progress changes, and then `rbt stamp && git push` when they're done with them.

David

--
Supercharge your Review Board with Power Pack: https://www.reviewboard.org/powerpack/
Want us to host Review Board for you? Check out RBCommons: https://rbcommons.com/
Happy user? Let us know! https://www.reviewboard.org/users/
---
You received this message because you are subscribed to the Google Groups "Review Board Community" group.
To unsubscribe from this group and stop receiving emails from it, send an email to reviewboard...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/reviewboard/c1db9bc3-c97e-43a1-b1d2-bcc7354a4b07n%40googlegroups.com.