Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109327: Generalize INTERNAL_FIELD between buffers, keyboards and frames.

[Paul Eggert]

On 08/02/2012 11:27 PM, Eli Zaretskii wrote:
> It's all there in your ~/.bzr.log file, so
> just grep it and tell how many conflicts you had in your merges

OK, here are my bzr conflict statistics for yesterday
(all were Emacs conflicts):

.bzr.log:13553:[ 7812] 2012-08-01 14:11:26.630 INFO: 5 conflicts encountered.   
.bzr.log:14918:[ 8983] 2012-08-01 15:28:13.254 INFO: 2 conflicts encountered.   
.bzr.log:15448:[16729] 2012-08-01 16:14:31.362 INFO: 1 conflicts encountered.   
.bzr.log:15644:[16751] 2012-08-01 16:16:06.115 INFO: 11 conflicts encountered.  
.bzr.log:15873:[16776] 2012-08-01 16:18:16.765 INFO: 5 conflicts encountered.   
.bzr.log:16824:[ 6817] 2012-08-01 19:08:41.422 INFO: 1 conflicts encountered.   
.bzr.log:17425:[30769] 2012-08-01 21:15:16.737 INFO: 1 conflicts encountered.   
.bzr.log:17811:[24363] 2012-08-01 23:23:15.386 INFO: 4 conflicts encountered.   
.bzr.log:17875:[24505] 2012-08-01 23:24:07.525 INFO: 5 conflicts encountered.   
.bzr.log:18569:[25094] 2012-08-01 23:52:10.131 INFO: 2 conflicts encountered.   

The worst one was a conflict that bzr didn't catch, and which
caused Emacs to crash afterwards.

Yesterday was high -- a more typical day I'll get five or ten conflicts.
But clearly our experiences differ, if you're getting only five
conflicts per year.