Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "MergeInfoDisplay" page has been changed by JulianFoad: http://wiki.apache.org/subversion/MergeInfoDisplay?action=diff&rev1=1&rev2=2 Comment: Formatting Run ‘svn mergeinfo’ for details. }}} == Reporting -- What “svn mergeinfo” Should Say == - In order for a user to understand what merges they have done and need to do, it would be most helpful if Subversion could tell them the current state of a branch with regard to merges. The existing “svn mergeinfo” command is near useless for such understanding: it just outputs a list of revnums without saying what that means in terms of whether the target is fully caught up or not; it doesn’t report anything meaningful about subtree merges and doesn’t even notice them by default; it doesn’t check that you specified a sensible source branch and simply says nothing if you accidentally specified the target branch. In a WC of ''feature branch'' “B”, which has had catch-ups through trunk@1234 except trunk@1215: * Mergeinfo summary: + In order for a user to understand what merges they have done and need to do, it would be most helpful if Subversion could tell them the current state of a branch with regard to merges. The existing “svn mergeinfo” command is near useless for such understanding: it just outputs a list of revnums without saying what that means in terms of whether the target is fully caught up or not; it doesn’t report anything meaningful about subtree merges and doesn’t even notice them by default; it doesn’t check that you specified a sensible source branch and simply says nothing if you accidentally specified the target branch. + In a WC of ''feature branch'' “B”, which has had catch-ups through trunk@1234 except trunk@1215: - * $ svn mergeinfo ^/trunk - * Origin: ^/branches/B@1200 (from ^/trunk@1190) - * Merged from ^/trunk: - * Origin-1214, 1216-1234 + * Mergeinfo summary:<<BR>> + {{{ + $ svn mergeinfo ^/trunk + Origin: /branches/B@1200 (from /trunk@1190) + Merged from ^/trunk: + Origin-1214, 1216-1234 + }}} * Automatic identification of the ''parent'' branch: + {{{ + $ svn mergeinfo + Parent branch is ^/trunk. + }}} + [... continue as for “svn mergeinfo ^/trunk” …] - * $ svn mergeinfo - * Parent branch is ^/trunk. - * [... continue as for “svn mergeinfo ^/trunk” …] - * Failed to identify a parent branch: + * Failed to identify a parent branch: <<BR>> + {{{ - * $ svn mergeinfo + $ svn mergeinfo - * svn: No parent branch configured for ^/branches/B + svn: No parent branch configured for ^/branches/B + }}} - * When no relationship is configured between this and the specified branch: + * When no relationship is configured between this and the specified branch: <<BR>> + {{{ - * $ svn mergeinfo ^/branches/B2 + $ svn mergeinfo ^/branches/B2 - * No declared relationship between ^/branches/B and ^/branches/B2. + No declared relationship between /branches/B and /branches/B2. - * Merged from ^/branches/B2: + Merged from ^/branches/B2: - * 905,970-977 + 905,970-977 + }}} - Mergeinfo should be “recursive” by default, reporting any sub-tree differences, where presently it does not. * How should the output look in the presence of subtree merges? + Mergeinfo should be “recursive” by default, reporting any sub-tree differences, where presently it does not. + * How should the output look in the presence of subtree merges? <<BR>> + {{{ - * $ svn mergeinfo + $ svn mergeinfo + ... + }}} === Mergeinfo Diff (bug) === Diff, when displaying an added mergeinfo property on a sub-tree, should diff against the previously inherited mergeinfo, not say that all this new mergeinfo represents merges that have just been done. Similarly for a deleted prop. Discussed in [[http://svn.haxx.se/dev/archive-2011-09/0201.shtml|this email thread]].
