Christian Boos wrote: > Georg wrote: > >> Hi, >> >> in the 0.12 multi repository branch, when I display a merge changeset, I get >> a very unusual display (see attachment). >> The .ccinventory file exists, but it is not the only file that changed. The >> "." for current directory occurs twice. >> > Ok, the display of a changeset could certainly be improved when there's > only one file to show (no Location: and "." entries). >
See latest version of multirepos branch (rev. 7260) (also in 0.11 and trunk). >> Clicking on .ccinventory or any of the "." displays the .ccinventory file >> (download dialog). Clicking on any of the "view diffs" simply redisplays >> the same page ? Btw, the fact that there was no diffs actually shown was either due to the file being a binary one or because there were only ignored changes (whitespace changes?). >> I expected to see a normal changeset display, listing the differences to the >> first parent. >> >> > > ... > That being said, I have to think a bit to see how this alternative > changeset view could be implemented. > See latest version of the mercurial plugin (http://trac.edgewall.org/changeset/7261), look for the new (diff) links next to the parent revs. As noted in the changeset, ideally there should be some additional work for filtering uninteresting chunks. That would probably need a new MERGE change type and some additional processing in changeset.py (see http://trac.edgewall.org/ticket/3236). > Btw, shouldn't that rather default to the second parent, which > corresponds to the merged head, i.e. the branch you're merging "in"? > ... and you were right of course, it should be a diff against the first parent in order to see the changes brought by the branch you're merging in, sorry for the confusion. -- Christian --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Development" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/trac-dev?hl=en -~----------~----~----~----~------~----~------~--~---
