RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/build/ .gitignore rpm/po/ .gitignore rpm/rpmio/ .gitign...

From: Pinto Elia <devzero2000@rpm5.org>
Date: Mon 27 Sep 2010 - 19:20:01 CEST
Message-Id: <20100927172001.09984DD44D@rpm5.org>
  RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2000@rpm5.org
  Module: rpm                              Date:   27-Sep-2010 19:20:01
  Branch: HEAD                             Handle: 2010092717195901

  Modified files:
    rpm/tests/ref           showrc
  Removed files:
    rpm/build               .gitignore
    rpm/po                  .gitignore
    rpm/rpmio               .gitignore
    rpm/tools               .gitignore

  Log:
    drop useless .gitignore

  Summary:
    Revision    Changes     Path
    1.2         +0  -12     rpm/build/.gitignore
    1.2         +0  -16     rpm/po/.gitignore
    1.2         +0  -57     rpm/rpmio/.gitignore
    1.33        +0  -17     rpm/tests/ref/showrc
    1.2         +0  -50     rpm/tools/.gitignore
  ____________________________________________________________________________

  rm -f rpm/build/.gitignore <<'@@ .'
  Index: rpm/build/.gitignore
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/po/.gitignore <<'@@ .'
  Index: rpm/po/.gitignore
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/.gitignore <<'@@ .'
  Index: rpm/rpmio/.gitignore
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/ref/showrc
  ============================================================================
  $ cvs diff -u -r1.32 -r1.33 showrc
  --- rpm/tests/ref/showrc	21 Sep 2010 16:08:34 -0000	1.32
  +++ rpm/tests/ref/showrc	27 Sep 2010 17:20:00 -0000	1.33
  @@ -37,22 +37,14 @@
       cpuinfo(acpi)
       cpuinfo(apic)
       cpuinfo(arch_perfmon)
  -<<<<<<< showrc
       cpuinfo(bogomips) = 5000.07
  -=======
  -    cpuinfo(bogomips) = 5985.37
  ->>>>>>> 1.30
       cpuinfo(bts)
       cpuinfo(cache_size) = 2048_KB
       cpuinfo(clflush)
       cpuinfo(clflush_size) = 64
       cpuinfo(cmov)
       cpuinfo(constant_tsc)
  -<<<<<<< showrc
       cpuinfo(cpu_MHz) = 1200.000
  -=======
  -    cpuinfo(cpu_MHz) = 2992.685
  ->>>>>>> 1.30
       cpuinfo(cpu_family) = 6
       cpuinfo(cx16)
       cpuinfo(cx8)
  @@ -94,10 +86,6 @@
       cpuinfo(tm)
       cpuinfo(tm2)
       cpuinfo(tsc)
  -<<<<<<< showrc
  -=======
  -    cpuinfo(tsc_reliable)
  ->>>>>>> 1.30
       cpuinfo(vme)
       cpuinfo(wp)
       cpuinfo(xsave)
  @@ -812,8 +800,3 @@
   %nil
   -14: with	%{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
   -14: without	%{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
  -<<<<<<< showrc
  -======================== active 488 empty 0
  -=======
  -======================== active 489 empty 0
  ->>>>>>> 1.30
  @@ .
  rm -f rpm/tools/.gitignore <<'@@ .'
  Index: rpm/tools/.gitignore
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
Received on Mon Sep 27 19:20:01 2010
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.