On Mon, Oct 04, 2010 at 06:31:53PM -0400, Richard Hipp wrote: > 2010/10/4 Lluís Batlle i Rossell <[email protected]> > > > On Mon, Oct 04, 2010 at 10:55:02PM +0200, Laurens Van Houtven wrote: > > I wonder how difficult it will be in fossil to find "the version of the > > parent > > branch last merged into a child branch". > > > > There is a command "fossil test-find-pivot" which will find the latest > common check-in between two branches. The comment is for testing purposes > only. But if you really need to know what that "pivot" is, you can use the > test command to find it I suppose. > > Is the above discussion in any way relevant to what you were talking about, > or have I completely missed the mark? I know that the 'merge' command will take care of all, but as we speak on reviewing, we want to know what will be merged *previous to a merge operation*.
We have the PARENT branch, and a CHILD branch to be reviewed. CHILD will be updated from PARENT at some point. What we want is to look at a diff of "what is new on CHILD in respect to PARENT" (show that in a diff visualisation tool), and as a result of the review write some notes in the CHILD branch. The notes may say "improve this" or "improve that". Only after all notes in the CHILD branch are solved, we consider the review as "ready for merge", and only then we will do the fossil merge operation. Did I make more clear the 'review' kind of problem we try to solve with this procedure? Thank you, Lluís. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
