Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-18 Thread Philip Boulain

On 18 Sep 2007, at 00:56, Ben Taylor wrote:

 J. Mayer [EMAIL PROTECTED] wrote:

On Mon, 2007-09-17 at 23:14 +0200, Luca wrote:

On 9/17/07, Andreas Färber [EMAIL PROTECTED] wrote:

Am 17.09.2007 um 14:18 schrieb Christian MICHON:

On 9/17/07, Philip Boulain [EMAIL PROTECTED] wrote:
...merely acts as bait for the grand old version repository  
flamewar.
...this commit was not disruptive to any of the Git users, and  
will

never be.

Both the qemu.org and the Savannah project page only mention CVS.

http://brick.kernel.dk/git/?p=qemu.git;a=summary

Another point is CVS is an industry standard.

The wine folks have been using [git] for a while, (maybe a  year?)...


ARGH. Unless QEMU is /actually/ going to spend the time switching  
repository systems for no forward progress, _off-topic_!


LionsPhil
(SVN beats all, clearly. ;) )





Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-18 Thread Thiemo Seufer
J. Mayer wrote:
[snip]
 Another point is CVS is an industry standard. It has many drawbacks but
 is prooven to do its job as specified in a very reliable way. For now,
 not such a thing for git, afaik. If it ever become the new industry
 standard, after having prooven its reliability and long term stability,
 then you may be able to expect everyone to use it.
 Did anyone has done a long term comparison of CVS and git running on two 
 copies of the
 same production repository and have made sure that any extraction at any
 time of any data (ie, checkout in the present and any date in the past,
 diffs, ...) of the two gives exactly the same result ? Please show me
 such studies and I may reconsider my position... If not, you can always
 use it, closing your eyes and praying for everything to be OK...

Not exactly a study, but www.linux-mips.org moved a fairly complex CVS
repository to GIT, and replaced the original CVS access with the git-cvs
daemon. No were/are no known inconsistencies.


Thiemo




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-18 Thread Andreas Färber

Hey,

Am 18.09.2007 um 00:47 schrieb Johannes Schindelin:


Both the qemu.org and the Savannah project page only mention CVS. If
there are better ways to get the code then inform your users how  
to use

that.


What about graphical diff tools?  Should you _not_ use them,  
because CVS

has an in-built diff?

Frankly, if even the most proficient committer of QEmu admits to use
quilt, which is definitely not CVS, you should rethink what you just
wrote.

Sticking to a tried and proven standard is one thing.

Sticking to an ancient standard that has proven to have severe
shortcomings (so much so that the ATM most popular central SCM,
Subversion, claims it is CVS done right; that alone should tell you
something), when there are better alternatives around, which  
moreover have

no problems talking back to CVS, is, well, not so clever.

Note that I do not say you should use git.  Just as I do not say  
you have

to stick with CVS.


Just to make this perfectly clear: I am not sticking to CVS at all.  
And I still believe I raised a valid point, being that you (the QEMU  
core developers) can't expect people to use e.g. git if only CVS is  
mentioned. No more, no less.


This has nothing to do with what (graphical) tools a user might use  
or not to look at patches/merges. The core problem that brought this  
discussion up is that using CVS it is hard to merge changes, i.e.  
it is not capable of doing so automatically in the 80% cases (if it  
were, no graphical tool would be needed either).


Neither am I sticking to CVS nor am I considering it proven nor do I  
like or even personally use it (I do prefer Subversion!). I use CVS  
here because that's the documented way to access the QEMU repository  
at Savannah (implication: if I do, others do so as well). Will  
personally look into git in the future - but my post was not about me.


To repeat, if you expect people to use git or something else ontop of  
or instead of CVS then tell people prominently so - not just here in  
the future discussion archives where newbies won't search for what  
they don't know, if they read the CVS instructions.


I am not opposing code cleanup, as seen here, but I do see the merge  
problem - for example with the ppc emulation issue on OS X that  
hasn't been responded to.


Regards,
Andreas




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-18 Thread Stefan Weil
Philip Boulain schrieb:
 ARGH. Unless QEMU is /actually/ going to spend the time switching
 repository systems for no forward progress, _off-topic_!

 LionsPhil
 (SVN beats all, clearly. ;) )
I agree - it might be a good idea to switch from CVS to Subversion (SVN):

* Both are reliable and well tested.
* It is possible to migrate from CVS to SVN without loosing change history.
* Both are user friendly (not only for experts) and have a nice Windows GUI.
* Both are well supported by Savannah.
* SVN has a lot of advantages in comparision with CVS.

My personal experience: we could get all the advantages of SVN
without any disadvantage and with minimal efforts.

It would be really nice to have all those QEMU user branches which exist
today in numerous different repositories using different technology
in one place. SVN could help to achieve this goal - GIT could do it, too.

Regards
Stefan





Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread J. Mayer
On Sun, 2007-09-16 at 21:08 +, Thiemo Seufer wrote:
 CVSROOT:  /sources/qemu
 Module name:  qemu
 Changes by:   Thiemo Seufer ths 07/09/16 21:08:06
 
 Modified files:
   .  : Changelog Makefile Makefile.target TODO aes.c 
alpha-dis.c arm-dis.c arm-semi.c block-bochs.c 
block-cloop.c block-cow.c block-dmg.c 
block-qcow.c block-qcow2.c block-raw.c 
block-vmdk.c block-vpc.c block-vvfat.c block.c 
block_int.h bswap.h cocoa.m configure console.c 
cpu-all.h cpu-defs.h cpu-exec.c cutils.c 
dis-asm.h disas.c dyngen-exec.h dyngen.c 
dyngen.h elf.h elf_ops.h exec-all.h exec.c 
gdbstub.c keymaps.c kqemu.c kqemu.h loader.c 
m68k-dis.c m68k-semi.c mips-dis.c monitor.c 
osdep.c ppc-dis.c qemu-doc.texi qemu-img.c 
qemu-img.texi qemu-tech.texi readline.c 
s390-dis.c sdl.c sh4-dis.c softmmu-semi.h 
softmmu_header.h softmmu_template.h sparc-dis.c 
tap-win32.c texi2pod.pl thunk.c thunk.h 
translate-all.c translate-op.c usb-linux.c vl.c 
vl.h vnc.c vnchextile.h 
   darwin-user: syscall.c 
   fpu: softfloat-native.c 
   hw : acpi.c adb.c alpha_palcode.c an5206.c apb_pci.c 
apic.c arm_boot.c arm_gic.c arm_pic.c arm_pic.h 
arm_sysctl.c arm_timer.c cdrom.c cirrus_vga.c 
cirrus_vga_rop.h cirrus_vga_rop2.h cuda.c 
eepro100.c esp.c fdc.c grackle_pci.c gt64xxx.c 
heathrow_pic.c i2c.c i8254.c i8259.c ide.c 
integratorcp.c iommu.c irq.c isa_mmio.c 
jazz_led.c lsi53c895a.c m48t59.c mc146818rtc.c 
mcf5206.c mcf5208.c mcf_fec.c mcf_intc.c 
mcf_uart.c mips_malta.c mips_r4k.c nand.c 
ne2000.c omap.h omap_lcd_template.h openpic.c 
parallel.c pc.c pci.c pci_host.h pckbd.c 
pcnet.c pflash_cfi02.c piix_pci.c pl011.c 
pl050.c pl080.c pl110.c pl110_template.h 
pl181.c pl190.c ppc.c ppc405.h ppc405_boards.c 
ppc405_uc.c ppc_chrp.c ppc_prep.c prep_pci.c 
ps2.c ptimer.c pxa2xx_gpio.c pxa2xx_template.h 
realview.c rtl8139.c sd.c sd.h serial.c 
sh7750.c sh7750_regs.h shix.c slavio_intctl.c 
slavio_misc.c slavio_serial.c slavio_timer.c 
smbus.c smbus.h smbus_eeprom.c smc91c111.c 
sparc32_dma.c sun4m.c sun4u.c tcx.c unin_pci.c 
usb-hid.c usb-hub.c usb-msd.c usb-uhci.c 
usb-wacom.c usb.c usb.h versatile_pci.c 
versatilepb.c vga.c vga_int.h vga_template.h 
vmmouse.c 
   keymaps: common de-ch et fr is modifiers nl sv 
   linux-user : elfload.c flat.h flatload.c linuxload.c 
m68k-sim.c main.c mmap.c qemu.h signal.c 
syscall.c syscall_defs.h syscall_types.h vm86.c 
   linux-user/alpha: syscall_nr.h 
   linux-user/ppc : syscall.h 
   linux-user/ppc64: syscall.h 
   linux-user/sh4 : termbits.h 
   linux-user/sparc: termbits.h 
   linux-user/sparc64: termbits.h 
   linux-user/x86_64: syscall_nr.h 
   slirp  : COPYRIGHT bootp.c cksum.c debug.c debug.h if.c 
if.h ip_icmp.c ip_input.c ip_output.c 
libslirp.h main.h mbuf.c mbuf.h misc.c misc.h 
sbuf.c sbuf.h slirp.c socket.c socket.h 
tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c 
tftp.c tftp.h udp.c udp.h 
   target-alpha   : cpu.h exec.h helper.c op.c op_helper.c 
op_helper.h op_helper_mem.h op_mem.h 
op_template.h translate.c 
   target-arm : cpu.h exec.h helper.c op.c op_helper.c 
op_iwmmxt.c op_template.h translate.c 
   target-arm/nwfpe: double_cpdo.c extended_cpdo.c fpa11.c fpa11.h 
 fpa11_cpdo.c fpa11_cpdt.c fpa11_cprt.c 
 fpopcode.c fpopcode.h fpsr.h single_cpdo.c 
   target-i386: cpu.h exec.h helper.c helper2.c op.c 
opreg_template.h ops_sse.h ops_template.h 
ops_template_mem.h translate-copy.c translate.c 
   target-m68k: cpu.h exec.h helper.c op.c op_helper.c 
translate.c 
   target-mips: 

Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Christian MICHON
On 9/17/07, J. Mayer [EMAIL PROTECTED] wrote:
  Log message:
find -type f | xargs sed -i 's/[\t ]$//g' # on most files

 Many thanks for generating hundreds of conflicts with a useless commit.
 Don't know what's wrong in your expression but it did not what you think
 it should (and you did not even check).

 DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.


if we were using git (but you can do it locally anyway), you would not
have these conflicts problems...

git-apply indead has this feature about ignoring useless whitespaces...

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Johannes Schindelin
Hi,

On Mon, 17 Sep 2007, J. Mayer wrote:

 On Sun, 2007-09-16 at 21:08 +, Thiemo Seufer wrote:
  CVSROOT:/sources/qemu
  Module name:qemu
  Changes by: Thiemo Seufer ths 07/09/16 21:08:06
 
  [lots of changes]
 
  Log message:
  find -type f | xargs sed -i 's/[\t ]$//g' # on most files
 
 Many thanks for generating hundreds of conflicts with a useless commit.

It is a whitespace fix, designed to remove tabs and spaces from ends of 
lines, where they have no business of being.

Yes, it is a style fix.  But a fix nevertheless.

And your conflicts are probably DUE TO AN INFERIOUR MERGE TOOL that _you_ 
use.  Time to join the modern world?

Ciao,
Dscho





Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread J. Mayer
On Mon, 2007-09-17 at 10:27 +0200, Christian MICHON wrote:
 On 9/17/07, J. Mayer [EMAIL PROTECTED] wrote:
   Log message:
 find -type f | xargs sed -i 's/[\t ]$//g' # on most files
 
  Many thanks for generating hundreds of conflicts with a useless commit.
  Don't know what's wrong in your expression but it did not what you think
  it should (and you did not even check).
 
  DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
 
 
 if we were using git (but you can do it locally anyway), you would not
 have these conflicts problems...

Maybe... but Savannah uses a CVS frontend, as far as I know...

 git-apply indead has this feature about ignoring useless whitespaces...

It does not seem a good idea that tools modify the code in our back.
Better learn people (including me...) not to write/commit incorrect
code...
Should also learn people not to break other's code, but that seems far
to difficult to understand

Regards.

-- 
J. Mayer [EMAIL PROTECTED]
Never organized





Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Philip Boulain
DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
   if we were using git (but you can do it locally anyway), you would not
   have these conflicts problems...
  Maybe... but Savannah uses a CVS frontend, as far as I know...
 Those are excuses.

So is a you should have used X argument. It doesn't invalidate the
point that the commit was disruptive, and merely acts as bait for the
grand old version repository flamewar.*

 Like whitespace change is breaking your code.  Really, I mean, come on.  
 Who do think you are kidding?

flamebaitPython programmers./flamebait ;)

LionsPhil
* See also, if they'd used Perl instead of find/xargs/sed






Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Christian MICHON
On 9/17/07, Philip Boulain [EMAIL PROTECTED] wrote:
 DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
if we were using git (but you can do it locally anyway), you would not
have these conflicts problems...
   Maybe... but Savannah uses a CVS frontend, as far as I know...
  Those are excuses.

 So is a you should have used X argument. It doesn't invalidate the
 point that the commit was disruptive, and merely acts as bait for the
 grand old version repository flamewar.*


since I mentionned you should have used Git, I'll repeat:
this commit was not disruptive to any of the Git users, and will
never be.

Evolve, or prepare to be assimilated into the Collective...

;-)

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Thiemo Seufer
J. Mayer wrote:
 On Sun, 2007-09-16 at 21:08 +, Thiemo Seufer wrote:
  CVSROOT:/sources/qemu
  Module name:qemu
  Changes by: Thiemo Seufer ths 07/09/16 21:08:06
  
  Modified files:
  .  : Changelog Makefile Makefile.target TODO aes.c 
   alpha-dis.c arm-dis.c arm-semi.c block-bochs.c 
   block-cloop.c block-cow.c block-dmg.c 
   block-qcow.c block-qcow2.c block-raw.c 
   block-vmdk.c block-vpc.c block-vvfat.c block.c 
   block_int.h bswap.h cocoa.m configure console.c 
   cpu-all.h cpu-defs.h cpu-exec.c cutils.c 
   dis-asm.h disas.c dyngen-exec.h dyngen.c 
   dyngen.h elf.h elf_ops.h exec-all.h exec.c 
   gdbstub.c keymaps.c kqemu.c kqemu.h loader.c 
   m68k-dis.c m68k-semi.c mips-dis.c monitor.c 
   osdep.c ppc-dis.c qemu-doc.texi qemu-img.c 
   qemu-img.texi qemu-tech.texi readline.c 
   s390-dis.c sdl.c sh4-dis.c softmmu-semi.h 
   softmmu_header.h softmmu_template.h sparc-dis.c 
   tap-win32.c texi2pod.pl thunk.c thunk.h 
   translate-all.c translate-op.c usb-linux.c vl.c 
   vl.h vnc.c vnchextile.h 
  darwin-user: syscall.c 
  fpu: softfloat-native.c 
  hw : acpi.c adb.c alpha_palcode.c an5206.c apb_pci.c 
   apic.c arm_boot.c arm_gic.c arm_pic.c arm_pic.h 
   arm_sysctl.c arm_timer.c cdrom.c cirrus_vga.c 
   cirrus_vga_rop.h cirrus_vga_rop2.h cuda.c 
   eepro100.c esp.c fdc.c grackle_pci.c gt64xxx.c 
   heathrow_pic.c i2c.c i8254.c i8259.c ide.c 
   integratorcp.c iommu.c irq.c isa_mmio.c 
   jazz_led.c lsi53c895a.c m48t59.c mc146818rtc.c 
   mcf5206.c mcf5208.c mcf_fec.c mcf_intc.c 
   mcf_uart.c mips_malta.c mips_r4k.c nand.c 
   ne2000.c omap.h omap_lcd_template.h openpic.c 
   parallel.c pc.c pci.c pci_host.h pckbd.c 
   pcnet.c pflash_cfi02.c piix_pci.c pl011.c 
   pl050.c pl080.c pl110.c pl110_template.h 
   pl181.c pl190.c ppc.c ppc405.h ppc405_boards.c 
   ppc405_uc.c ppc_chrp.c ppc_prep.c prep_pci.c 
   ps2.c ptimer.c pxa2xx_gpio.c pxa2xx_template.h 
   realview.c rtl8139.c sd.c sd.h serial.c 
   sh7750.c sh7750_regs.h shix.c slavio_intctl.c 
   slavio_misc.c slavio_serial.c slavio_timer.c 
   smbus.c smbus.h smbus_eeprom.c smc91c111.c 
   sparc32_dma.c sun4m.c sun4u.c tcx.c unin_pci.c 
   usb-hid.c usb-hub.c usb-msd.c usb-uhci.c 
   usb-wacom.c usb.c usb.h versatile_pci.c 
   versatilepb.c vga.c vga_int.h vga_template.h 
   vmmouse.c 
  keymaps: common de-ch et fr is modifiers nl sv 
  linux-user : elfload.c flat.h flatload.c linuxload.c 
   m68k-sim.c main.c mmap.c qemu.h signal.c 
   syscall.c syscall_defs.h syscall_types.h vm86.c 
  linux-user/alpha: syscall_nr.h 
  linux-user/ppc : syscall.h 
  linux-user/ppc64: syscall.h 
  linux-user/sh4 : termbits.h 
  linux-user/sparc: termbits.h 
  linux-user/sparc64: termbits.h 
  linux-user/x86_64: syscall_nr.h 
  slirp  : COPYRIGHT bootp.c cksum.c debug.c debug.h if.c 
   if.h ip_icmp.c ip_input.c ip_output.c 
   libslirp.h main.h mbuf.c mbuf.h misc.c misc.h 
   sbuf.c sbuf.h slirp.c socket.c socket.h 
   tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c 
   tftp.c tftp.h udp.c udp.h 
  target-alpha   : cpu.h exec.h helper.c op.c op_helper.c 
   op_helper.h op_helper_mem.h op_mem.h 
   op_template.h translate.c 
  target-arm : cpu.h exec.h helper.c op.c op_helper.c 
   op_iwmmxt.c op_template.h translate.c 
  target-arm/nwfpe: double_cpdo.c extended_cpdo.c fpa11.c fpa11.h 
fpa11_cpdo.c fpa11_cpdt.c fpa11_cprt.c 
fpopcode.c fpopcode.h fpsr.h single_cpdo.c 
  target-i386: cpu.h exec.h helper.c helper2.c op.c 
   opreg_template.h ops_sse.h ops_template.h 
   ops_template_mem.h translate-copy.c translate.c 
  target-m68k: cpu.h exec.h helper.c op.c op_helper.c 
   translate.c 
  target-mips: exec.h fop_template.c helper.c op.c op_helper.c 
  

Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread M. Warner Losh
In message: [EMAIL PROTECTED]
Johannes Schindelin [EMAIL PROTECTED] writes:
: Hi,
: 
: On Mon, 17 Sep 2007, J. Mayer wrote:
: 
:  On Sun, 2007-09-16 at 21:08 +, Thiemo Seufer wrote:
:   CVSROOT:  /sources/qemu
:   Module name:  qemu
:   Changes by:   Thiemo Seufer ths 07/09/16 21:08:06
:  
:   [lots of changes]
:  
:   Log message:
: find -type f | xargs sed -i 's/[\t ]$//g' # on most files
:  
:  Many thanks for generating hundreds of conflicts with a useless commit.
: 
: It is a whitespace fix, designed to remove tabs and spaces from ends of 
: lines, where they have no business of being.
: 
: Yes, it is a style fix.  But a fix nevertheless.
: 
: And your conflicts are probably DUE TO AN INFERIOUR MERGE TOOL that _you_ 
: use.  Time to join the modern world?

In reality, it best to never commit trailing white space in the first
place.  It only causes pain and misery.  This being one flavor of
that.

Warner




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Andreas Färber


Am 17.09.2007 um 14:18 schrieb Christian MICHON:


On 9/17/07, Philip Boulain [EMAIL PROTECTED] wrote:

DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
if we were using git (but you can do it locally anyway), you  
would not

have these conflicts problems...

Maybe... but Savannah uses a CVS frontend, as far as I know...

Those are excuses.


So is a you should have used X argument. It doesn't invalidate the
point that the commit was disruptive, and merely acts as bait for the
grand old version repository flamewar.*



since I mentionned you should have used Git, I'll repeat:
this commit was not disruptive to any of the Git users, and will
never be.

Evolve, or prepare to be assimilated into the Collective...


Both the qemu.org and the Savannah project page only mention CVS. If  
there are better ways to get the code then inform your users how to  
use that. Writing only of CVS and then telling people they should  
have used git instead is pure nonsense. Face reality; this is not  
some science-fiction movie.


Andreas




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Luca
On 9/17/07, Andreas Färber [EMAIL PROTECTED] wrote:

 Am 17.09.2007 um 14:18 schrieb Christian MICHON:

  On 9/17/07, Philip Boulain [EMAIL PROTECTED] wrote:
  DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
  if we were using git (but you can do it locally anyway), you
  would not
  have these conflicts problems...
  Maybe... but Savannah uses a CVS frontend, as far as I know...
  Those are excuses.
 
  So is a you should have used X argument. It doesn't invalidate the
  point that the commit was disruptive, and merely acts as bait for the
  grand old version repository flamewar.*
 
 
  since I mentionned you should have used Git, I'll repeat:
  this commit was not disruptive to any of the Git users, and will
  never be.
 
  Evolve, or prepare to be assimilated into the Collective...

 Both the qemu.org and the Savannah project page only mention CVS. If
 there are better ways to get the code then inform your users how to
 use that.

http://brick.kernel.dk/git/?p=qemu.git;a=summary
It's tracking QEMU CVS; you're right that it's not mentioned anywhere
on the site (AFAICS).
You can also DIY with git-cvsimport; see e.g.
http://chneukirchen.org/blog/archive/2006/04/tracking-the-ruby-cvs-with-git.html

Luca


Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread J. Mayer
On Mon, 2007-09-17 at 23:14 +0200, Luca wrote:
 On 9/17/07, Andreas Färber [EMAIL PROTECTED] wrote:
 
  Am 17.09.2007 um 14:18 schrieb Christian MICHON:
 
   On 9/17/07, Philip Boulain [EMAIL PROTECTED] wrote:
   DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
   if we were using git (but you can do it locally anyway), you
   would not
   have these conflicts problems...
   Maybe... but Savannah uses a CVS frontend, as far as I know...
   Those are excuses.
  
   So is a you should have used X argument. It doesn't invalidate the
   point that the commit was disruptive, and merely acts as bait for the
   grand old version repository flamewar.*
  
  
   since I mentionned you should have used Git, I'll repeat:
   this commit was not disruptive to any of the Git users, and will
   never be.
  
   Evolve, or prepare to be assimilated into the Collective...
 
  Both the qemu.org and the Savannah project page only mention CVS. If
  there are better ways to get the code then inform your users how to
  use that.

 http://brick.kernel.dk/git/?p=qemu.git;a=summary
 It's tracking QEMU CVS; you're right that it's not mentioned anywhere
 on the site (AFAICS).
 You can also DIY with git-cvsimport; see e.g.
 http://chneukirchen.org/blog/archive/2006/04/tracking-the-ruby-cvs-with-git.html

Another point is CVS is an industry standard. It has many drawbacks but
is prooven to do its job as specified in a very reliable way. For now,
not such a thing for git, afaik. If it ever become the new industry
standard, after having prooven its reliability and long term stability,
then you may be able to expect everyone to use it.
Did anyone has done a long term comparison of CVS and git running on two copies 
of the
same production repository and have made sure that any extraction at any
time of any data (ie, checkout in the present and any date in the past,
diffs, ...) of the two gives exactly the same result ? Please show me
such studies and I may reconsider my position... If not, you can always
use it, closing your eyes and praying for everything to be OK...

Regards.

-- 
J. Mayer [EMAIL PROTECTED]
Never organized





Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Christian MICHON
On 9/17/07, Andreas Färber [EMAIL PROTECTED] wrote:
  Evolve, or prepare to be assimilated into the Collective...

 Both the qemu.org and the Savannah project page only mention CVS. If
 there are better ways to get the code then inform your users how to
 use that. Writing only of CVS and then telling people they should
 have used git instead is pure nonsense.

it's been more than a year since I turned my back to CVS. I do not
recall writing only of CVS. What I said was: if we were using Git,
we would not face these merge conflicts.

You can point to git copies of the CVS qemu repository, or perform
yourself the import. You can even push your modification into the
CVS vault using Git.

If this is not clear to you, see this link:
http://www.youtube.com/watch?v=4XpnKHJAok8

Sticking with CVS is pure nonsense. Period.

 Face reality; this is not some science-fiction movie.

You should face reality. Linux kernel, Xorg, KDE and soon
Gnome made the move over to Git.

It was a sci-fi joke, by the way: I put a smiley behind it.

Einsverstanden ? ;-)

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !




Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Johannes Schindelin
Hi,

On Mon, 17 Sep 2007, Andreas F?rber wrote:

 Both the qemu.org and the Savannah project page only mention CVS. If 
 there are better ways to get the code then inform your users how to use 
 that.

What about graphical diff tools?  Should you _not_ use them, because CVS 
has an in-built diff?

Frankly, if even the most proficient committer of QEmu admits to use 
quilt, which is definitely not CVS, you should rethink what you just 
wrote.

Sticking to a tried and proven standard is one thing.

Sticking to an ancient standard that has proven to have severe 
shortcomings (so much so that the ATM most popular central SCM, 
Subversion, claims it is CVS done right; that alone should tell you 
something), when there are better alternatives around, which moreover have 
no problems talking back to CVS, is, well, not so clever.

Note that I do not say you should use git.  Just as I do not say you have 
to stick with CVS.

Ciao,
Dscho





Re: [Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-17 Thread Ben Taylor

 J. Mayer [EMAIL PROTECTED] wrote: 
 On Mon, 2007-09-17 at 23:14 +0200, Luca wrote:
  On 9/17/07, Andreas Färber [EMAIL PROTECTED] wrote:
  
   Am 17.09.2007 um 14:18 schrieb Christian MICHON:
  
On 9/17/07, Philip Boulain [EMAIL PROTECTED] wrote:
DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE.
if we were using git (but you can do it locally anyway), you
would not
have these conflicts problems...
Maybe... but Savannah uses a CVS frontend, as far as I know...
Those are excuses.
   
So is a you should have used X argument. It doesn't invalidate the
point that the commit was disruptive, and merely acts as bait for the
grand old version repository flamewar.*
   
   
since I mentionned you should have used Git, I'll repeat:
this commit was not disruptive to any of the Git users, and will
never be.
   
Evolve, or prepare to be assimilated into the Collective...
  
   Both the qemu.org and the Savannah project page only mention CVS. If
   there are better ways to get the code then inform your users how to
   use that.
 
  http://brick.kernel.dk/git/?p=qemu.git;a=summary
  It's tracking QEMU CVS; you're right that it's not mentioned anywhere
  on the site (AFAICS).
  You can also DIY with git-cvsimport; see e.g.
  http://chneukirchen.org/blog/archive/2006/04/tracking-the-ruby-cvs-with-git.html
 
 Another point is CVS is an industry standard. It has many drawbacks but
 is prooven to do its job as specified in a very reliable way. For now,
 not such a thing for git, afaik. If it ever become the new industry
 standard, after having prooven its reliability and long term stability,
 then you may be able to expect everyone to use it.
 Did anyone has done a long term comparison of CVS and git running on two 
 copies of the
 same production repository and have made sure that any extraction at any
 time of any data (ie, checkout in the present and any date in the past,
 diffs, ...) of the two gives exactly the same result ? Please show me
 such studies and I may reconsider my position... If not, you can always
 use it, closing your eyes and praying for everything to be OK...

The wine folks have been using it for a while, (maybe a  year?), and they 
are prolithic committers.  I see approximately 20-30 patches a day, 
monday-friday.






[Qemu-devel] qemu Changelog Makefile Makefile.target TODO ae...

2007-09-16 Thread Thiemo Seufer
CVSROOT:/sources/qemu
Module name:qemu
Changes by: Thiemo Seufer ths 07/09/16 21:08:06

Modified files:
.  : Changelog Makefile Makefile.target TODO aes.c 
 alpha-dis.c arm-dis.c arm-semi.c block-bochs.c 
 block-cloop.c block-cow.c block-dmg.c 
 block-qcow.c block-qcow2.c block-raw.c 
 block-vmdk.c block-vpc.c block-vvfat.c block.c 
 block_int.h bswap.h cocoa.m configure console.c 
 cpu-all.h cpu-defs.h cpu-exec.c cutils.c 
 dis-asm.h disas.c dyngen-exec.h dyngen.c 
 dyngen.h elf.h elf_ops.h exec-all.h exec.c 
 gdbstub.c keymaps.c kqemu.c kqemu.h loader.c 
 m68k-dis.c m68k-semi.c mips-dis.c monitor.c 
 osdep.c ppc-dis.c qemu-doc.texi qemu-img.c 
 qemu-img.texi qemu-tech.texi readline.c 
 s390-dis.c sdl.c sh4-dis.c softmmu-semi.h 
 softmmu_header.h softmmu_template.h sparc-dis.c 
 tap-win32.c texi2pod.pl thunk.c thunk.h 
 translate-all.c translate-op.c usb-linux.c vl.c 
 vl.h vnc.c vnchextile.h 
darwin-user: syscall.c 
fpu: softfloat-native.c 
hw : acpi.c adb.c alpha_palcode.c an5206.c apb_pci.c 
 apic.c arm_boot.c arm_gic.c arm_pic.c arm_pic.h 
 arm_sysctl.c arm_timer.c cdrom.c cirrus_vga.c 
 cirrus_vga_rop.h cirrus_vga_rop2.h cuda.c 
 eepro100.c esp.c fdc.c grackle_pci.c gt64xxx.c 
 heathrow_pic.c i2c.c i8254.c i8259.c ide.c 
 integratorcp.c iommu.c irq.c isa_mmio.c 
 jazz_led.c lsi53c895a.c m48t59.c mc146818rtc.c 
 mcf5206.c mcf5208.c mcf_fec.c mcf_intc.c 
 mcf_uart.c mips_malta.c mips_r4k.c nand.c 
 ne2000.c omap.h omap_lcd_template.h openpic.c 
 parallel.c pc.c pci.c pci_host.h pckbd.c 
 pcnet.c pflash_cfi02.c piix_pci.c pl011.c 
 pl050.c pl080.c pl110.c pl110_template.h 
 pl181.c pl190.c ppc.c ppc405.h ppc405_boards.c 
 ppc405_uc.c ppc_chrp.c ppc_prep.c prep_pci.c 
 ps2.c ptimer.c pxa2xx_gpio.c pxa2xx_template.h 
 realview.c rtl8139.c sd.c sd.h serial.c 
 sh7750.c sh7750_regs.h shix.c slavio_intctl.c 
 slavio_misc.c slavio_serial.c slavio_timer.c 
 smbus.c smbus.h smbus_eeprom.c smc91c111.c 
 sparc32_dma.c sun4m.c sun4u.c tcx.c unin_pci.c 
 usb-hid.c usb-hub.c usb-msd.c usb-uhci.c 
 usb-wacom.c usb.c usb.h versatile_pci.c 
 versatilepb.c vga.c vga_int.h vga_template.h 
 vmmouse.c 
keymaps: common de-ch et fr is modifiers nl sv 
linux-user : elfload.c flat.h flatload.c linuxload.c 
 m68k-sim.c main.c mmap.c qemu.h signal.c 
 syscall.c syscall_defs.h syscall_types.h vm86.c 
linux-user/alpha: syscall_nr.h 
linux-user/ppc : syscall.h 
linux-user/ppc64: syscall.h 
linux-user/sh4 : termbits.h 
linux-user/sparc: termbits.h 
linux-user/sparc64: termbits.h 
linux-user/x86_64: syscall_nr.h 
slirp  : COPYRIGHT bootp.c cksum.c debug.c debug.h if.c 
 if.h ip_icmp.c ip_input.c ip_output.c 
 libslirp.h main.h mbuf.c mbuf.h misc.c misc.h 
 sbuf.c sbuf.h slirp.c socket.c socket.h 
 tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c 
 tftp.c tftp.h udp.c udp.h 
target-alpha   : cpu.h exec.h helper.c op.c op_helper.c 
 op_helper.h op_helper_mem.h op_mem.h 
 op_template.h translate.c 
target-arm : cpu.h exec.h helper.c op.c op_helper.c 
 op_iwmmxt.c op_template.h translate.c 
target-arm/nwfpe: double_cpdo.c extended_cpdo.c fpa11.c fpa11.h 
  fpa11_cpdo.c fpa11_cpdt.c fpa11_cprt.c 
  fpopcode.c fpopcode.h fpsr.h single_cpdo.c 
target-i386: cpu.h exec.h helper.c helper2.c op.c 
 opreg_template.h ops_sse.h ops_template.h 
 ops_template_mem.h translate-copy.c translate.c 
target-m68k: cpu.h exec.h helper.c op.c op_helper.c 
 translate.c