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

2014-10-31 Thread Ru Vuott
Thanks. vuott Ven 31/10/14, Benoît Minisini ha scritto: Oggetto: Re: [Gambas-user] Conflict discovered in file A: "mailing list for gambas users" Data: Venerdì 31 ottobre 2014, 23:23 Le 31/10/2014 23:02, Ru Vuott a écrit :

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

2014-10-31 Thread Benoît Minisini
Le 31/10/2014 23:02, Ru Vuott a écrit : > Uh. 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

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

2014-10-31 Thread Ru Vuott
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 ha scritto: Oggetto: Re

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

2014-10-31 Thread Ru Vuott
. Thanks at all. vuott Gio 30/10/14, Benoît Minisini ha scritto: Oggetto: Re: [Gambas-user] Conflict discovered in file A: "mailing list for gambas users" Data: Giovedì 30 ottobre 2014, 23:41 Le 30/10/2014 23:20, Tobias Boe

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

2014-10-30 Thread Tobias Boege
On Fri, 31 Oct 2014, B Bruen wrote: > On Thu, 30 Oct 2014 23:41:09 +0100 > Beno?t Minisini wrote: > > > 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: > > >> > > >> > > >> Co

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

2014-10-30 Thread B Bruen
On Thu, 30 Oct 2014 23:41:09 +0100 Benoît Minisini wrote: > 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.highligh

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

2014-10-30 Thread Benoît Minisini
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) mer

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

2014-10-30 Thread Tobias Boege
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

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

2014-10-30 Thread Ru Vuott
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