2010/10/4 Lluís Batlle i Rossell <[email protected]>: > On Mon, Oct 04, 2010 at 10:55:02PM +0200, Laurens Van Houtven wrote: > You can review against the trunk version it was updated from. As any DVCS, > fossil does not provide methods to guarantee that noone commited over the same > parent as you, so if that happens, you then will have to merge two heads of a > single branch. This is inherent in DVCS, and not related to your review > process.
Yeah I was kind of hoping there was a way of creating a diff for the entire branch that just combines the subsequent changes. Or some automagic way of doing this. I guess it's not much of a problem. >> Is there a decent way of filtering tickets on the ones which are up >> for review and which ones aren't? In trac, I did this with tags; but >> fossil doesn't appear to have tags for tickets. > You can write your own queries for fossil, and your own fields in each ticket. > In the web Admin -> Ticket configuration you can find that. Oh, cool, thanks. >> Also what do you people use for code review? I can imagine using >> fossil diff for this, I guess. Ideas welcome. > I still have not moved our scripts from svn to fossil, but what we used to do > was prepare two checkout directories, one with the last trunk version merged > in, > and the other with the branch to review. Then we used meld (meld.sf.net) to > get > a diff while being able to edit the files. > Then we leave comments and commit in the branch with the review results. > > I wonder how difficult it will be in fossil to find "the version of the parent > branch last merged into a child branch". I will take a look at meld, thank you. > Regards, > Lluís. cheers lvh _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
