Emmanuel Blot wrote: >> i.e. for each source branch, you'd see what was already merged and >> what's still available for merge. >> > > Ok I think I get it. >
Not sure we're on the same line yet, as I was talking of displaying in a nice way the content of the *svn:mergeinfo* property. > This information is useful, however eligible can only be shown > * if you have started to merge some changeset from a source branch, and > so obviously, if the branch is listed in the svn:mergeinfo, it's because a merge has already been done, and therefore there's at least some "merged" info to show, and possibly "eligible" as well... > * if you have not merged all the changeset from the source branch > ... unless there's nothing more to merge, in which case we could always show (nothing to merge) instead of the "eligible" link. > In other words, it cannot show the eligible candidates from branches > you've never merged back from. > IMHO, the term "eligible" here can be quite confusing: you cannot > assume the list of valid source URLs. > Sure, but this is not what I wanted to do. >> In this example, the 'eligible' link for branches/0.11-stable would link >> to http://trac.edgewall.org/log/?revs=8184,8198,8211,8217-8218 (as of >> r8227). >> > > However, imagine I've created a branch from /tr...@8200, this branch > would be eligible but not appear as eligible till I start merging it > back to the trunk. > > >> Knowing what is 'eligible' from a given branch is a quite important >> information to my eyes, as with 'svn merge' you have to explicitly tell >> what revisions you want to merge (except for the --reintegrate special >> case). >> > > ... which lead to another important point: 95% of our merge operations > are made out of "svn merge --reintegrate". > Maybe a special case, but something heavily used in our development > cycle. All the candidates for merge --reintegrate would not appear as > "eligible" here. > Right, I have to give more testing to this use case. -- 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 -~----------~----~----~----~------~----~------~--~---
