[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Re: [si] Conflict in kcmkclock.po in trunk
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2009-09-24 22:28:40
Message-ID: 200909250028.41054.aacid () kde ! org
[Download RAW message or body]

A Dijous, 24 de setembre de 2009, Danishka Navin va escriure:
> On Thu, Sep 24, 2009 at 1:43 AM, Albert Astals Cid <aacid@kde.org> wrote:
> > A Dimecres, 23 de setembre de 2009, Danishka Navin va escriure:
> > > Hi Albert,
> > >
> > > here is the output
> > >
> > >  LC_ALL=C svn up
> > > Skipped 'kcmkclock.po'
> > > U    kcmlocale.po
> > > G    processui.po
> > > U    dolphin.po
> > > U    powerdevil.po
> > > U    plasma_applet_clock.po
> > > Updated to revision 1027202.
> > > Summary of conflicts:
> > >   Skipped paths: 1
> > >
> > >
> > > -----------------------------
> > >
> > > svn up
> > > Skipped 'kcmkclock.po'
> > > At revision 1027204.
> > > Summary of conflicts:
> > >   Skipped paths: 1
> >
> > It seems the problem is a local conflict, please do
> >
> > svn st
> > and see if it appears something like
> > C kcmclock.po
> 
> yes, it was there
> 
> > this means you have to fix that file, the easy way for that is
> > svn revert kcmclock.po
> 
> yes, i did
> 
> > but this means you'll loose all changes you had in it. The more difficult
> > way
> > is hand editing it, if you open it with a text editor like kwrite you'll
> > find
> > zones marked with
> > <<<<<<<<<<<<<<<<<<<<<
> > new stuff
> > ====================
> > your stuff
> >
> > you'll have to manually remove the <<< === and >>> and do the merge of
> > new stuff with your stuff.
> 
> nothing marked as above
> 
> finally i tried
> 
> svn rm  kcmclock.po
> 
> as well..
> 
> may be i screwed it  :P
> 
> 
> now svn st showing follwing..
> 
> 
> R     C kcmkclock.po
> 
>       >   local delete, incoming edit upon update
> 
> svn ci -m "removing kcmkclock.po"
> svn: Commit failed (details follow):
> svn: Aborting commit: '/data/cvs/kde/messages/kdebase/kcmkclock.po' remains
> in conflict
> 
> 
> i have a backup copy
> could you please remove the kcmkclock.po from the repo (if it work)?

No, the problem is in your local checkout of the repo, not on the server.

Please try this:

svn revert kcmkclock.po
svn resolved kcmkclock.po
svn up

If this does not work, just remove the whole dir containing your translations 
(use 'rm' not 'svn rm') and check it out again.

Albert
[prev in list] [next in list] [prev in thread] [next in thread]