On Sat, 2009-03-21 at 23:17 +0000, davidswelt wrote:
> I'd like to add another, probably related case.
> I decided to merge just the latest revisions, that is, just 22 revisions:
>
> ~/Projects/Bazaar-Playground/import-from-cvs/emacs$ bzr merge ../../emacs-dl/emacs/trunk -r 96946.. -v
> [\ ] Transferring:Walking content. 96968/96968
>
> When it appears to be done "walking content", it basically appears to
> freeze. Again, it's working hard, but neither the progress bar nor
> anything else is changing.
>
> The indication of completed revisions is misleading - obviously there is
> much more to "walking the content", because otherwise it'd be done by
> now.
>
> (I also don't understand why merging 22 revisions is taking forever.)
It's converting 97K revisions to the same format from the look of it - I
suspect you have parallel imports with different history or some such
thing.
This is something probably much better discussed on e.g. #bzr, or the
<email address hidden> mailing list - I suspect you have confused
set of branches rather than merge doing the wrong thing.
Certainly our progress bar in 1.13 is less than desirable during the
pulling-of-data phase, this is getting fixed during 1.14, and was only
made the way it was in 1.13 to get a many-times improvement in push and
pull times (ranging from 2:1 to 1000:1 depending on the scenario
involved).
On Sat, 2009-03-21 at 23:17 +0000, davidswelt wrote: Bazaar- Playground/ import- from-cvs/ emacs$ bzr merge ../../emacs- dl/emacs/ trunk -r 96946.. -v Walking content. 96968/96968
> I'd like to add another, probably related case.
> I decided to merge just the latest revisions, that is, just 22 revisions:
>
> ~/Projects/
> [\ ] Transferring:
>
> When it appears to be done "walking content", it basically appears to
> freeze. Again, it's working hard, but neither the progress bar nor
> anything else is changing.
>
> The indication of completed revisions is misleading - obviously there is
> much more to "walking the content", because otherwise it'd be done by
> now.
>
> (I also don't understand why merging 22 revisions is taking forever.)
It's converting 97K revisions to the same format from the look of it - I
suspect you have parallel imports with different history or some such
thing.
This is something probably much better discussed on e.g. #bzr, or the
<email address hidden> mailing list - I suspect you have confused
set of branches rather than merge doing the wrong thing.
Certainly our progress bar in 1.13 is less than desirable during the
pulling-of-data phase, this is getting fixed during 1.14, and was only
made the way it was in 1.13 to get a many-times improvement in push and
pull times (ranging from 2:1 to 1000:1 depending on the scenario
involved).
-Rob