* My bzr diff output for Emacs is now 6 MB
@ 2011-02-02 3:40 Lennart Borgman
2011-02-02 4:03 ` Eli Zaretskii
0 siblings, 1 reply; 8+ messages in thread
From: Lennart Borgman @ 2011-02-02 3:40 UTC (permalink / raw)
To: Emacs-Devel devel
It looks like bzr failed to merge date changes etc. Why does this happen?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 3:40 My bzr diff output for Emacs is now 6 MB Lennart Borgman
@ 2011-02-02 4:03 ` Eli Zaretskii
2011-02-02 4:07 ` Lennart Borgman
0 siblings, 1 reply; 8+ messages in thread
From: Eli Zaretskii @ 2011-02-02 4:03 UTC (permalink / raw)
To: Lennart Borgman; +Cc: emacs-devel
> From: Lennart Borgman <lennart.borgman@gmail.com>
> Date: Wed, 2 Feb 2011 04:40:32 +0100
>
> It looks like bzr failed to merge date changes etc.
What do you mean by "merging date changes"?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 4:03 ` Eli Zaretskii
@ 2011-02-02 4:07 ` Lennart Borgman
2011-02-02 12:06 ` Eli Zaretskii
0 siblings, 1 reply; 8+ messages in thread
From: Lennart Borgman @ 2011-02-02 4:07 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
On Wed, Feb 2, 2011 at 5:03 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Lennart Borgman <lennart.borgman@gmail.com>
>> Date: Wed, 2 Feb 2011 04:40:32 +0100
>>
>> It looks like bzr failed to merge date changes etc.
>
> What do you mean by "merging date changes"?
The only difference I saw in several files where the date changes in
the headers.
However now - after a new checkout - things seems back to normal. It
looks like bzr needs several turns sometimes to do the job.
This was for my emacsw32 branch. There was no such problem for just
the trunk checkout.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 4:07 ` Lennart Borgman
@ 2011-02-02 12:06 ` Eli Zaretskii
2011-02-02 12:27 ` Lennart Borgman
0 siblings, 1 reply; 8+ messages in thread
From: Eli Zaretskii @ 2011-02-02 12:06 UTC (permalink / raw)
To: Lennart Borgman; +Cc: emacs-devel
> From: Lennart Borgman <lennart.borgman@gmail.com>
> Date: Wed, 2 Feb 2011 05:07:12 +0100
> Cc: emacs-devel@gnu.org
>
> On Wed, Feb 2, 2011 at 5:03 AM, Eli Zaretskii <eliz@gnu.org> wrote:
> >> From: Lennart Borgman <lennart.borgman@gmail.com>
> >> Date: Wed, 2 Feb 2011 04:40:32 +0100
> >>
> >> It looks like bzr failed to merge date changes etc.
> >
> > What do you mean by "merging date changes"?
>
>
> The only difference I saw in several files where the date changes in
> the headers.
What do you mean by "headers"?
> However now - after a new checkout - things seems back to normal. It
> looks like bzr needs several turns sometimes to do the job.
That'd be news to me. But it's hard to say anything intelligent
without seeing at least one instance of these "failed merges".
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 12:06 ` Eli Zaretskii
@ 2011-02-02 12:27 ` Lennart Borgman
2011-02-02 13:46 ` Eli Zaretskii
2011-02-02 16:08 ` Stefan Monnier
0 siblings, 2 replies; 8+ messages in thread
From: Lennart Borgman @ 2011-02-02 12:27 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
On Wed, Feb 2, 2011 at 1:06 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Lennart Borgman <lennart.borgman@gmail.com>
>> Date: Wed, 2 Feb 2011 05:07:12 +0100
>> Cc: emacs-devel@gnu.org
>>
>> On Wed, Feb 2, 2011 at 5:03 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> >> From: Lennart Borgman <lennart.borgman@gmail.com>
>> >> Date: Wed, 2 Feb 2011 04:40:32 +0100
>> >>
>> >> It looks like bzr failed to merge date changes etc.
>> >
>> > What do you mean by "merging date changes"?
>>
>>
>> The only difference I saw in several files where the date changes in
>> the headers.
>
> What do you mean by "headers"?
It was those lines that differed for every file:
;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
But that was probably not all.
>> However now - after a new checkout - things seems back to normal. It
>> looks like bzr needs several turns sometimes to do the job.
>
> That'd be news to me. But it's hard to say anything intelligent
> without seeing at least one instance of these "failed merges".
I did not save this one, but I have an old output from bzr diff from
2010-12-29 which is 6 MB. The diff is done after the merge and against
the checked out trunk.
Unfortunately the bzr diff output does not contain any details about
what revisions was diffed. (Is not that a big omitting?)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 12:27 ` Lennart Borgman
@ 2011-02-02 13:46 ` Eli Zaretskii
2011-02-02 16:08 ` Stefan Monnier
1 sibling, 0 replies; 8+ messages in thread
From: Eli Zaretskii @ 2011-02-02 13:46 UTC (permalink / raw)
To: Lennart Borgman; +Cc: emacs-devel
> From: Lennart Borgman <lennart.borgman@gmail.com>
> Date: Wed, 2 Feb 2011 13:27:59 +0100
> Cc: emacs-devel@gnu.org
>
> It was those lines that differed for every file:
>
> ;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
That's when the Copyright notices were updated for all the files,
to include 2011, because a new year has begun. What was the problem
with these lines?
> I did not save this one, but I have an old output from bzr diff from
> 2010-12-29 which is 6 MB. The diff is done after the merge and against
> the checked out trunk.
So what is the problem here? If every file has its first line or two
changed, the diff of 6MB is normal.
> Unfortunately the bzr diff output does not contain any details about
> what revisions was diffed. (Is not that a big omitting?)
"bzr diff" always diffs against the current version by default, which
you can see with "bzr revno". If you give non-default -rREVNO
arguments to "bzr diff", then presumably you already know the
revisions yourself.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 12:27 ` Lennart Borgman
2011-02-02 13:46 ` Eli Zaretskii
@ 2011-02-02 16:08 ` Stefan Monnier
2011-02-03 18:28 ` Lennart Borgman
1 sibling, 1 reply; 8+ messages in thread
From: Stefan Monnier @ 2011-02-02 16:08 UTC (permalink / raw)
To: Lennart Borgman; +Cc: Eli Zaretskii, emacs-devel
> I did not save this one, but I have an old output from bzr diff from
> 2010-12-29 which is 6 MB. The diff is done after the merge and against
> the checked out trunk.
You probably didn't do the diff you thought you were doing. A common
case for is to do the diff before committing: Bzr stupidly ignores the
pending merges when computing the ancestry, so a "diff -rsubmit:"
applied after a merge but before the corresponding commit will show
misleading results.
> Unfortunately the bzr diff output does not contain any details about
> what revisions was diffed. (Is not that a big omitting?)
IIRC I filed a bug about that (or added to a pre-existing bug about
that) a few years ago. Please look for that bug and add your voice
to it.
Stefan
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: My bzr diff output for Emacs is now 6 MB
2011-02-02 16:08 ` Stefan Monnier
@ 2011-02-03 18:28 ` Lennart Borgman
0 siblings, 0 replies; 8+ messages in thread
From: Lennart Borgman @ 2011-02-03 18:28 UTC (permalink / raw)
To: Stefan Monnier; +Cc: Eli Zaretskii, emacs-devel
On Wed, Feb 2, 2011 at 5:08 PM, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
>> I did not save this one, but I have an old output from bzr diff from
>> 2010-12-29 which is 6 MB. The diff is done after the merge and against
>> the checked out trunk.
>
> You probably didn't do the diff you thought you were doing. A common
> case for is to do the diff before committing: Bzr stupidly ignores the
> pending merges when computing the ancestry, so a "diff -rsubmit:"
> applied after a merge but before the corresponding commit will show
> misleading results.
Hm, I thought so, but I am using this for merging and the diff is done later:
@setlocal
@set DEVHOME=bld
@pushd %DEVHOME%\emacs\trunk
bzr update
@popd
@pushd %DEVHOME%\emacs\emacsw32
bzr merge
bzr commit -m "Merge from trunk"
@popd
>> Unfortunately the bzr diff output does not contain any details about
>> what revisions was diffed. (Is not that a big omitting?)
>
> IIRC I filed a bug about that (or added to a pre-existing bug about
> that) a few years ago. Please look for that bug and add your voice
> to it.
I will if you tell me how to find it.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-02-03 18:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-02 3:40 My bzr diff output for Emacs is now 6 MB Lennart Borgman
2011-02-02 4:03 ` Eli Zaretskii
2011-02-02 4:07 ` Lennart Borgman
2011-02-02 12:06 ` Eli Zaretskii
2011-02-02 12:27 ` Lennart Borgman
2011-02-02 13:46 ` Eli Zaretskii
2011-02-02 16:08 ` Stefan Monnier
2011-02-03 18:28 ` Lennart Borgman
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).