linux-apus-devel

Not sure sure if I should commit

[Ken T. <ke...@we...>]

Hello,

I was about to commit the heartbeat/soundfilter patch when I noticed this
from a cvs ... status command :

File: ppc_ksyms.c       Status: File had conflicts on merge

   Working revision:    1.3
   Repository revision: 1.3  /cvsroot/linux-apus/2.2/arch/ppc/kernel/ppc_ksyms.c,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

This error/warning doesn't rate a mention in my book

All I'm trying to do is add 4 lines to ppc_ksyms.c :

diff -u -u -r1.3 ppc_ksyms.c
--- arch/ppc/kernel/ppc_ksyms.c 2000/09/12 12:15:19     1.3
+++ arch/ppc/kernel/ppc_ksyms.c 2000/09/16 11:32:35
@@ -231,6 +231,11 @@
 EXPORT_SYMBOL(memory);
 #endif /* CONFIG_APUS */

+#ifdef CONFIG_HEARTBEAT
+EXPORT_SYMBOL(enable_heartbeat);
+EXPORT_SYMBOL(disable_heartbeat);
+#endif
+
 #ifdef CONFIG_MOL
 #include <asm/mmu_context.h>
 extern PTE *Hash;

Is it safe to commit or what's wrong ?

Ken.

Re: Not sure sure if I should commit

[Michel <dae...@st...>]

Ken Tyler schrieb:

> I was about to commit the heartbeat/soundfilter patch when I noticed this
> from a cvs ... status command :
> 
> File: ppc_ksyms.c       Status: File had conflicts on merge
> 
>    Working revision:    1.3
>    Repository revision: 1.3  /cvsroot/linux-apus/2.2/arch/ppc/kernel/ppc_ksyms.c,v
>    Sticky Tag:          (none)
>    Sticky Date:         (none)
>    Sticky Options:      (none)
> 
> This error/warning doesn't rate a mention in my book


Look at the file. If there's a conflict, there is at least one line that
consists only of a lot of '<', then some lines of code, then a line with only
'=', some code again and finally a line with only '>'. CVS couldn't merge the
two code bits on its own. Do it manually and you should be able to commit.


Michel


-- 
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86 and The DRI Project

Re: Not sure sure if I should commit

[Ken T. <ke...@we...>]

On Sun, 17 Sep 2000, Michel [iso-8859-1] Dänzer wrote:

> > File: ppc_ksyms.c       Status: File had conflicts on merge

> Look at the file. If there's a conflict, there is at least one line that
> consists only of a lot of '<', then some lines of code, then a line with only
> '=', some code again and finally a line with only '>'. CVS couldn't merge the
> two code bits on its own. Do it manually and you should be able to commit.

That's what i got the first time as i didn't have the MOL changes in
ppc_ksyms and got the conflict <<<===>>> markers. Moved my changes out of
the way, did update -D now (thank you) to get the MOL changes, put my
changes back in ppc_ksyms.

If I do cvs diff everthing looks OK, shows my changes, no conflict markers
but cvs status still says 'File had conflicts on merge'.

I'll do some more investigating but i'm fooled (which is not hard).

Ken.

Re: Not sure sure if I should commit

[Michel <da...@re...>]

Ken Tyler wrote:
> 
> On Sun, 17 Sep 2000, Michel [iso-8859-1] Dänzer wrote:
> 
> > > File: ppc_ksyms.c       Status: File had conflicts on merge
> 
> > Look at the file. If there's a conflict, there is at least one line that
> > consists only of a lot of '<', then some lines of code, then a line with
> > only '=', some code again and finally a line with only '>'. CVS couldn't
> > merge the two code bits on its own. Do it manually and you should be able
> > to commit.
> 
> That's what i got the first time as i didn't have the MOL changes in
> ppc_ksyms and got the conflict <<<===>>> markers. Moved my changes out of
> the way, did update -D now (thank you) to get the MOL changes, put my
> changes back in ppc_ksyms.
> 
> If I do cvs diff everthing looks OK, shows my changes, no conflict markers
> but cvs status still says 'File had conflicts on merge'.

Oh, I thought this was when you tried to commit. I think this is just a hint,
CVS remember that there was a conflict, but you have dealt with it and so the
commit should work fine. Otherwise, it will abort anyway :)


Michel


-- 
Earthling Michel Dänzer (MrCooper)  \  CS student and free software enthusiast
Debian GNU/Linux (powerpc,i386) user \   member of XFree86 and the DRI project

Re: Not sure sure if I should commit

[Ken T. <ke...@we...>]

On Mon, 18 Sep 2000, Michel [iso-8859-1] Dänzer wrote:

> Oh, I thought this was when you tried to commit. I think this is just a hint,
> CVS remember that there was a conflict, but you have dealt with it and so the
> commit should work fine. Otherwise, it will abort anyway :)

What I've done now is move my 2.2 out of the way and got a 'new' 2.2 (and
2.3) and diffed my old 2.2 against the fresh 2.2.  The only code changes
are mine but there are about 3000 lines of diffs in the CVS directories.
I don't know if this because I'm starting out again or if my old tree has
been corrupted.

I'll hold off on the commit and look into Geert's suggestion about the 2.4
way.

Ken.

Re: Not sure sure if I should commit

[Roman Z. <zi...@fh...>]

Hi,

> This error/warning doesn't rate a mention in my book

info -f cvs
(Multiple developers -> File status)

After you resolved all conflicts you can rerun cvs update and the state
should change to "Locally Modified".

bye, Roman

Re: Not sure sure if I should commit

[Geert U. <ge...@li...>]

On Sun, 17 Sep 2000, Ken Tyler wrote:
> I was about to commit the heartbeat/soundfilter patch when I noticed this
> from a cvs ... status command :
> 
> File: ppc_ksyms.c       Status: File had conflicts on merge
> 
>    Working revision:    1.3
>    Repository revision: 1.3  /cvsroot/linux-apus/2.2/arch/ppc/kernel/ppc_ksyms.c,v
>    Sticky Tag:          (none)
>    Sticky Date:         (none)
>    Sticky Options:      (none)
> 
> This error/warning doesn't rate a mention in my book

Search for `^<<<' (`^' is start of line) in ppc_ksyms.c.

> All I'm trying to do is add 4 lines to ppc_ksyms.c :
> 
> diff -u -u -r1.3 ppc_ksyms.c
> --- arch/ppc/kernel/ppc_ksyms.c 2000/09/12 12:15:19     1.3
> +++ arch/ppc/kernel/ppc_ksyms.c 2000/09/16 11:32:35
> @@ -231,6 +231,11 @@
>  EXPORT_SYMBOL(memory);
>  #endif /* CONFIG_APUS */
> 
> +#ifdef CONFIG_HEARTBEAT
> +EXPORT_SYMBOL(enable_heartbeat);
> +EXPORT_SYMBOL(disable_heartbeat);
> +#endif
> +
>  #ifdef CONFIG_MOL
>  #include <asm/mmu_context.h>
>  extern PTE *Hash;
> 
> Is it safe to commit or what's wrong ?

Wouldn't it be better to implement it the same way as in 2.4.x? Iain Sandoe is
working on sharing the dmasound drivers between 2.2.x and 2.4.x.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: Not sure sure if I should commit

[Ken T. <ke...@we...>]

On Sun, 17 Sep 2000, Geert Uytterhoeven wrote:

> Wouldn't it be better to implement it the same way as in 2.4.x? Iain Sandoe is
> working on sharing the dmasound drivers between 2.2.x and 2.4.x.

I don't know, what are the 'rules' ?

I can't see the point, a lot looks like it changed in dmasound, this works
(if I could work out the cvs thing).

I'll have a look, if its easy yes, if not no.

Ken.