After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 389254 - Conflicts during checkout
Conflicts during checkout
Status: RESOLVED INVALID
Product: GStreamer
Classification: Platform
Component: gst-plugins-base
git master
Other Linux
: Normal normal
: NONE
Assigned To: GStreamer Maintainers
GStreamer Maintainers
Depends on:
Blocks:
 
 
Reported: 2006-12-24 17:03 UTC by Gustavo Carneiro
Modified: 2006-12-26 12:17 UTC
See Also:
GNOME target: ---
GNOME version: 2.17/2.18


Description Gustavo Carneiro 2006-12-24 17:03:27 UTC 
I didn't touch gst-plugins-base, yet I get CVS conflicts during checkout:

Conflicts during checkout:
  C po/af.po
  C po/az.po
  C po/cs.po
  C po/en_GB.po
  C po/hu.po
  C po/it.po
  C po/nb.po
  C po/nl.po
  C po/or.po
  C po/sq.po
  C po/sr.po
  C po/sv.po
  C po/uk.po
  C po/vi.po
Comment 1 Tim-Philipp Müller 2006-12-25 19:37:35 UTC 
This usually happens when releases are made by someone with different tools versions than you have on your distro (say, the releaser uses Fedora and you use ubuntu/debian).

Please do

  $ cd gst-plugins-base/po/
  $ rm .#*
  $ rm *po
  $ cvs up

for all affected modules.

Sorry for the inconvenience.
Comment 2 Gustavo Carneiro 2006-12-26 12:17:02 UTC 
OK; if it only happens for releases then I guess it's fair.