* NS compile error after trunk merge r118324
@ 2014-11-09 6:12 Adrian Robert
2014-11-09 10:36 ` Jan D.
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Robert @ 2014-11-09 6:12 UTC (permalink / raw)
To: emacs-devel@gnu.org Development; +Cc: Jan Djärv
Hi,
I get a compile error from trunk
> nsterm.m:3922:11: error: use of undeclared identifier 'update_p'
> update_p = YES;
> ^
> nsterm.m:3926:7: error: use of undeclared identifier 'update_p'
> if (update_p)
>
Adding a definition at nsterm.m: 3855:
BOOL update_p = YES;
“fixes" it, but I don’t think it is right since it looks from the changes like ns_set_vertical_scrollbar() and ns_set_horizontal_scrollbar() were seen as one function. I’m not sure if this error was in the original emacs-24 branch or came from the merge to trunk. (Was the ‘horizontal’ method created in trunk? If so there may be a number of other divergences to look at.)
http://lists.gnu.org/archive/html/emacs-diffs/2014-11/msg00117.html
http://lists.gnu.org/archive/html/emacs-diffs/2014-11/msg00120.html
thanks,
Adrian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: NS compile error after trunk merge r118324
2014-11-09 6:12 NS compile error after trunk merge r118324 Adrian Robert
@ 2014-11-09 10:36 ` Jan D.
2014-11-09 19:40 ` Glenn Morris
0 siblings, 1 reply; 7+ messages in thread
From: Jan D. @ 2014-11-09 10:36 UTC (permalink / raw)
To: Adrian Robert; +Cc: emacs-devel@gnu.org Development
Hi.
The bzr merge did some strange things, fixed now.
Jan D.
> 9 nov 2014 kl. 07:12 skrev Adrian Robert <adrian.b.robert@gmail.com>:
>
> Hi,
>
> I get a compile error from trunk
>
>> nsterm.m:3922:11: error: use of undeclared identifier 'update_p'
>> update_p = YES;
>> ^
>> nsterm.m:3926:7: error: use of undeclared identifier 'update_p'
>> if (update_p)
>>
>
>
> Adding a definition at nsterm.m: 3855:
>
> BOOL update_p = YES;
>
> “fixes" it, but I don’t think it is right since it looks from the changes like ns_set_vertical_scrollbar() and ns_set_horizontal_scrollbar() were seen as one function. I’m not sure if this error was in the original emacs-24 branch or came from the merge to trunk. (Was the ‘horizontal’ method created in trunk? If so there may be a number of other divergences to look at.)
>
> http://lists.gnu.org/archive/html/emacs-diffs/2014-11/msg00117.html
> http://lists.gnu.org/archive/html/emacs-diffs/2014-11/msg00120.html
>
> thanks,
> Adrian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: NS compile error after trunk merge r118324
2014-11-09 10:36 ` Jan D.
@ 2014-11-09 19:40 ` Glenn Morris
2014-11-09 21:25 ` Jan D.
0 siblings, 1 reply; 7+ messages in thread
From: Glenn Morris @ 2014-11-09 19:40 UTC (permalink / raw)
To: Jan D.; +Cc: Adrian Robert, emacs-devel@gnu.org Development
Sorry if I messed that up. There are a lot of merge conflicts these days,
though I don't remember getting one with that change.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: NS compile error after trunk merge r118324
2014-11-09 19:40 ` Glenn Morris
@ 2014-11-09 21:25 ` Jan D.
2014-11-09 22:57 ` Glenn Morris
0 siblings, 1 reply; 7+ messages in thread
From: Jan D. @ 2014-11-09 21:25 UTC (permalink / raw)
To: Glenn Morris; +Cc: Adrian Robert, emacs-devel@gnu.org Development
Hi.
> 9 nov 2014 kl. 20:40 skrev Glenn Morris <rgm@gnu.org>:
>
>
> Sorry if I messed that up. There are a lot of merge conflicts these days,
> though I don't remember getting one with that change.
No problem. I expected problems but not that one.
In the 24 branch there is just one scroll function, but in trunk there are two,
one for vertical, and one for horizontal. Bzr applied half of the change to one function and the other half to the other. It did not mark any conflict.
I have only seen this merge behavior in Perforce before, but that is known for doing merges badly. Lets just hope Git does better.
Jan D.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-11-10 7:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-09 6:12 NS compile error after trunk merge r118324 Adrian Robert
2014-11-09 10:36 ` Jan D.
2014-11-09 19:40 ` Glenn Morris
2014-11-09 21:25 ` Jan D.
2014-11-09 22:57 ` Glenn Morris
2014-11-10 6:17 ` Jan Djärv
2014-11-10 7:40 ` Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.