Re: Reviewing merges
Thanks Aaron. The VCS I had in mind was Mercurial. I'm not sure about the other VCSes, but in Mercurial, it's common to refer to a changeset with two parents. I think a 3-way diff would be the ideal mechanism here. On Apr 30, 2:28 pm, Aaron Sherman a...@ajs.com wrote: You're using the term two parents very liberally. I don't know of a version control system that sees merges in this way. Every node in a repository has, in my experience across a wide variety of systems, one parent. It might have merge history that involves other sources (in any system that tracks merge history like git, Perforce, Clearcase, etc.) but that's not a parent, per se. Parenting typically comes from one of two mechanics: branching or versioning. When you branch, you create a new entity whose immediate parent is on another branch. When you version you create a new entity whose immediate parent is on the same branch. A good 3-way diff would actually account for this, showing changes from the parent, and then perhaps highlighting to indicate what parts of those changes might have come from any given merge source. And no, I don't know of anything in RB that does that because RB is version control system agnostic, so it doesn't even assume you HAVE merge tracking. On Fri, Apr 30, 2010 at 4:52 PM, Andrew aschwa...@gmail.com wrote: Hi all. Is there any support for reviewing merges (changesets with two parents)? I imagine that ideally, it would be a review request that has two diffs -- one against the first parent and the other against the second parent. -- Aaron Sherman Email or GTalk: a...@ajs.comhttp://www.ajs.com/~ajs -- Want to help the Review Board project? Donate today athttp://www.reviewboard.org/donate/ Happy user? Let us know athttp://www.reviewboard.org/users/ -~--~~~~--~~--~--~--- To unsubscribe from this group, send email to reviewboard+unsubscr...@googlegroups.com For more options, visit this group athttp://groups.google.com/group/reviewboard?hl=en -- 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
Re: Reviewing merges
I'm not sure this helps, but when you publish a review request and then update the review request with a new changeset it will diff again against the previous diff. Each update/publish produces a delta that you can follow. However, publishing does email the groups/users, which you may not want. -Ryan On Apr 30, 1:52 pm, Andrew aschwa...@gmail.com wrote: Hi all. Is there any support for reviewing merges (changesets with two parents)? I imagine that ideally, it would be a review request that has two diffs -- one against the first parent and the other against the second parent. -- Want to help the Review Board project? Donate today athttp://www.reviewboard.org/donate/ Happy user? Let us know athttp://www.reviewboard.org/users/ -~--~~~~--~~--~--~--- To unsubscribe from this group, send email to reviewboard+unsubscr...@googlegroups.com For more options, visit this group athttp://groups.google.com/group/reviewboard?hl=en -- 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
Re: Reviewing merges
On Friday 30 April 2010 10:52:53 pm Andrew wrote: Hi all. Is there any support for reviewing merges (changesets with two parents)? I imagine that ideally, it would be a review request that has two diffs -- one against the first parent and the other against the second parent. I guess you're still talking about Mercurial. In Mercurial, the diffs are always done conventionally against the first parent, including merges. This is in particular the case with the hg diff -c cset command. This makes sense are you are usually pulling some branch changes, and this is what you want to review and what you specify to the hg merge command. When you use the mercurial-reviewboard extension, you can still use the --parent option to specify the parent from which computing the diff. Regards. Gilles. -- 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
Re: Reviewing merges
You're using the term two parents very liberally. I don't know of a version control system that sees merges in this way. Every node in a repository has, in my experience across a wide variety of systems, one parent. It might have merge history that involves other sources (in any system that tracks merge history like git, Perforce, Clearcase, etc.) but that's not a parent, per se. Parenting typically comes from one of two mechanics: branching or versioning. When you branch, you create a new entity whose immediate parent is on another branch. When you version you create a new entity whose immediate parent is on the same branch. A good 3-way diff would actually account for this, showing changes from the parent, and then perhaps highlighting to indicate what parts of those changes might have come from any given merge source. And no, I don't know of anything in RB that does that because RB is version control system agnostic, so it doesn't even assume you HAVE merge tracking. On Fri, Apr 30, 2010 at 4:52 PM, Andrew aschwa...@gmail.com wrote: Hi all. Is there any support for reviewing merges (changesets with two parents)? I imagine that ideally, it would be a review request that has two diffs -- one against the first parent and the other against the second parent. -- Aaron Sherman Email or GTalk: a...@ajs.com http://www.ajs.com/~ajs -- 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
