Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "SimpleAndSafeMerges" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SimpleAndSafeMerges?action=diff&rev1=13&rev2=14 == 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. + (Mark Phippard said, and I agree with this: "It will be interesting to see if you can show both eligible and merged information at the same time in a way that is understandable. I think if the command can show some things like there the branch came from, or the other path that the branch is merging with, could be useful new information. Sort of like svn info for a branch. I think it makes sense to highly condense the revisions as they are never going to add a lot of value in this kind of context.") + In a WC of ''feature branch'' “B”, which has had catch-ups through trunk@1234 except trunk@1215: * Mergeinfo summary:<<BR>> @@ -118, +120 @@ Discussed in [[http://svn.haxx.se/dev/archive-2011-09/0201.shtml|this email thread]]. + === Mergeinfo command - backward compatibility === + If you specify --show-revs={eligible|merged} you'll get the old simple list of revs, and if you don't specify either of those then you'll get the new summary instead. Discussed in [[http://svn.haxx.se/dev/archive-2011-10/0048.shtml|this email thread]]. +
