Re: Handling non-linear DVCS histories (git)

2010-08-10 Thread Stephen Gallagher
On 08/09/2010 02:32 PM, Yang Zhang wrote: I'm using reviewboard with git projects, and I'm interested in hearing how other folks are handling non-linear DVCS histories. Each commit may have one or two parents - for those with two, how does one generate a patch from that (if you do at all)?

Re: Handling non-linear DVCS histories (git)

2010-08-10 Thread Dan Savilonis
My general workflow is to create a topic branch tracking one of the official branches on a remote server and let post-review detect the merge base. This generates a diff between the last state of that branch and my changes. I don't use RB for merge reviews. It would be good if we got an update on

Handling non-linear DVCS histories (git)

2010-08-09 Thread Yang Zhang
I'm using reviewboard with git projects, and I'm interested in hearing how other folks are handling non-linear DVCS histories. Each commit may have one or two parents - for those with two, how does one generate a patch from that (if you do at all)? Thanks. -- Yang Zhang http://yz.mit.edu/ --