[Gambas-user] Conflict discovered in file....

[Ru Vuott]

Uhmmmm..... no, I suppose I didn't solve the problem.

Well, now trying updating I obtain this message:

~ $ svn checkout svn://svn.code.sf.net/p/gambas/code/gambas/trunk
svn: E155004: Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
svn: E155004: Working copy '/home/vuott/trunk' locked.
svn: E155004: '/home/vuott/trunk' is already locked.


What's this "lock" ?

How do I solve the problem ?  :-(

Regards
vuott





--------------------------------------------
Ven 31/10/14, Ru Vuott <vuott at ...325...> ha scritto:

 Oggetto: Re: [Gambas-user] Conflict discovered in file....
 A: "mailing list for gambas users" <gambas-user at lists.sourceforge.net>
 Data: Venerdì 31 ottobre 2014, 16:48
 
 Hello,
 
 well, re-starting from
 Terminal
 ~ $ svn checkout
 svn://svn.code.sf.net/p/gambas/code/gambas/trunk
 a message suggests me to run: make clean
 
 So, I run
 ~ $
 /trunkmake clean
 and then I started again
 from 
 ~ $ svn checkout
 svn://svn.code.sf.net/p/gambas/code/gambas/trunk
 and so on.
 
 It
 worked.
 
 Thanks at all.
 vuott
 
 
 
 --------------------------------------------
 Gio 30/10/14, Benoît Minisini <gambas at ...1...>
 ha scritto:
 
  Oggetto: Re:
 [Gambas-user] Conflict discovered in file....
  A: "mailing list for gambas users"
 <gambas-user at lists.sourceforge.net>
  Data: Giovedì 30 ottobre 2014, 23:41
  
  Le 30/10/2014 23:20,
  Tobias Boege a écrit :
  >
 On Thu, 30 Oct
  2014, Ru Vuott wrote:
  >> Hello,
  >>
  >> updating
  Gambas
 with  rev. #6593, I have this message:
 
 >>
  >>
  >>
 Conflict discovered in file
 
 'trunk/comp/src/gb.eval.highlight/.startup'.
  >> Select: (p) postpone, (df) show
 diff,
  (e) edit file, (m) merge,
  >>     
      (mc)
 my side of conflict, (tc) their side of
 
 conflict,
  >>          (s)
 show
  all options: s
 
 >>
  >>
  >>
 What choose
  do you suggest ?
  >>
  >
  > I'm not a svn
  expert
 but if you didn't change the file, you should be
  fine
  > with
 "tc".
  >
  >
 In any case, it
  shouldn't matter
 because .startup is a generated
  file,
  > created by the compiler. It
  carries no new information and you can just
 go
  > and regenerate it. This begs the
 question
  why it is versioned in the
 first
  >
  place...
  >
  >
 
 Regards,
  > Tobi
  >
  
  It's a bug, that file
  should not be in the repository. I will fix
 that...
  
  -- 
  Benoît
  Minisini
  
 
 ------------------------------------------------------------------------------
 
 _______________________________________________
  Gambas-user mailing list
  Gambas-user at lists.sourceforge.net
  https://lists.sourceforge.net/lists/listinfo/gambas-user
 
 ------------------------------------------------------------------------------
 _______________________________________________
 Gambas-user mailing list
 Gambas-user at lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/gambas-user