On Wed, 05 Apr 2006, Blair Zajac wrote: ... > $ /usr/bin/time ~/bin/svnmerge -s -v -v integrated > svn propget --strict "svnmerge-integrated" "." > svnmerge: calculate head path for the branch > svn info "." > svn info "http://svn/svn/repos/spijava/branches/blair"; > svnmerge: head is "http://svn/svn/repos/spijava/trunk"; > svn propget --strict "svnmerge-integrated" "." > svn log -r 1:HEAD --limit=1 -q . > svnmerge: available revisions to be merged are: > 40413-106349 > 200.51user 1.21system 3:40.93elapsed 91%CPU (0avgtext+0avgdata > 0maxresident)k > 0inputs+0outputs (0major+13592minor)pagefaults 0swaps > > > A couple of things. > > 1) The message 'available revisions to be merged are' is confusing, given > that I ran the integrated command. It should say which revisions were > integrated. > > 2) It took a lot of CPU time and clock time (over 3 minutes). After it > runs the > > svn log -r 1:HEAD --limit=1 -q . > > there's no visible indication of what the script is doing. I assumed that > it was stuck in the response from the svn log, but it turns out that that > returns in a couple of second, so that's not the cause. > > It would be good to have an additional message stating what its doing then.
Blair, thanks a lot for kicking the tires. I've updated the output when in verbose mode in r19195 for both #1 and #2. I suspect that the extra time may be due to subtracting the revisions which predate the branch ([EMAIL PROTECTED], line 1011), code which I now believe may not even be correct for the 'integrated' command. I may've conflated my thoughts with implementation of the 'rollback' command (Giovanni as alluded to as much in his follow-up comment about "why are you even running log?"). I'll investigate that this week. Thanks, Dan
pgpfsg7OUwxnD.pgp
Description: PGP signature
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
