On Tue, Dec 4, 2012 at 10:15 AM, Mark Phippard <[email protected]> wrote: > On Tue, Dec 4, 2012 at 10:14 AM, Mark Phippard <[email protected]> wrote: >> On Tue, Dec 4, 2012 at 10:05 AM, Hyrum K Wright <[email protected]> >> wrote: >> >>>> For your particular case, can you tell me what branch at what revision >>>> your merge target was? >>> >>> >>> The merge target was the ev2-export branch, which was probably most recently >>> merged around 2-3 weeks ago, so it's not incredibly out-of-date. To >>> reproduce, you could probably just back up the branch to before the most >>> recent merge, and go from there. >> >> Using the current HEAD of that branch I can see the same problem. >> Been several minutes and still no merge output. Interesting that I do >> not see this same problem with the fsfs-format7 branch. I wonder what >> is different? Subtree mergeinfo? > > Merge finished just as I hit Send: > > $ time svn merge ^/subversion/trunk > --- Merging r1416745 through r1416980 into '.': > U subversion/libsvn_wc/wc-queries.sql > U subversion/libsvn_wc/wc_db_update_move.c > --- Recording mergeinfo for merge of r1231319 through r1416980 into '.': > U . > > real 3m46.879s > user 0m0.228s > sys 0m0.071s > > Did not see any of those notifications until the last 1 second. So it > was about 3:45 of silence.
I see the same thing with trunk@1416985/serf1.1.1: C:\SVN\src-branch-ev2-export>timethis svn merge https://svn.apache.org/repos/asf/subversion/trunk . TimeThis : Command Line : svn merge https://svn.apache.org/repos/asf/subversion/trunk . TimeThis : Start Time : Tue Dec 04 10:27:15 2012 --- Merging r1416745 through r1416991 into '.': U subversion\libsvn_wc\wc-queries.sql U subversion\libsvn_wc\wc_db_update_move.c --- Recording mergeinfo for merge of r1231319 through r1416991 into '.': U . TimeThis : Command Line : svn merge https://svn.apache.org/repos/asf/subversion/trunk . TimeThis : Start Time : Tue Dec 04 10:27:15 2012 TimeThis : End Time : Tue Dec 04 10:30:32 2012 TimeThis : Elapsed Time : 00:03:16.998 Note that the equivalent cherry pick merge runs promptly: C:\SVN\src-branch-ev2-export>svn revert -Rq . C:\SVN\src-branch-ev2-export>timethis svn merge -r1416744:1416991 https://svn.apache.org/repos/asf/subversion/trunk . TimeThis : Command Line : svn merge -r1416744:1416991 https://svn.apache.org/repos/asf/subversion/trunk . TimeThis : Start Time : Tue Dec 04 10:31:34 2012 --- Merging r1416745 through r1416991 into '.': U subversion\libsvn_wc\wc-queries.sql U subversion\libsvn_wc\wc_db_update_move.c --- Recording mergeinfo for merge of r1416745 through r1416991 into '.': U . TimeThis : Command Line : svn merge -r1416744:1416991 https://svn.apache.org/repos/asf/subversion/trunk . TimeThis : Start Time : Tue Dec 04 10:31:34 2012 TimeThis : End Time : Tue Dec 04 10:31:39 2012 TimeThis : Elapsed Time : 00:00:05.305 -- Paul T. Burba CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development Skype: ptburba
