Hi Christian, Am Donnerstag, den 26.06.2008, 18:59 +0200 schrieb Christian Boos: > 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).
Thanks, way cool! The only "strangeness" I now see is that the changeset diff displays the same change twice. It's the .ccinventory file, it was (AFAICT) the same in the merged 121 and the parent 119, and was different in the parent 118. I get two entries for it, and clicking on either one displays a diff between 118 and 121. Is this expected? > > ... > > 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). Even more cool! -- Thank you very much, Georg. --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
