Emmanuel Blot wrote:
>> No, it's just what `svn mergeinfo --show-revs eligible` would show... I
>> was thinking about the repository browser view, here. I suppose you were
>> thinking about the changeset view. There, we could simply show what has
>> been merged, in a way very similar to svn diff, e.g.
>> trunk> svn diff -c8225
>> ...
>> Modified: svn:mergeinfo
>>   Merged /branches/0.11-stable:r8215-8216
>>     
>
> Not sure to understand
> svn mergeinfo --show-revs eligible shows what could be merged
> svn mergeinfo --show-revs merged shows what have been actually merged
>
> I'm not sure what you'd want to show with 'eligible'?
> What would be the source branch(es) in this case?
>   

Look at my example again.
Imagine you would see the following, when browsing 
http://trac.edgewall.org/browser/trunk

 svn:mergeinfo:
  - sandbox/rework-merging   merged eligible
  - branches/0.11-stable     merged eligible

i.e. for each source branch, you'd see what was already merged and 
what's still available for merge.

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).

Currently the 'eligible' info for sandbox/rework-merging is ... r8000, 
which is the revision corresponding to the branch creation. But that's 
probably due to an older svn 1.5.x being used at that time ;-)

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).

-- 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
-~----------~----~----~----~------~----~------~--~---

Reply via email to