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

[Tobias Boege]

On Fri, 31 Oct 2014, B Bruen wrote:
> On Thu, 30 Oct 2014 23:41:09 +0100
> Beno?t Minisini <gambas at ...1...> 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.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
> 
> The .startup file is in quite a few of the components...

Specifically:

$ svn ls -R | grep \\.startup | xargs dirname
app/other/MakeWebSite
app/src/gambas-wiki
app/src/gambas3-farm-server
app/src/gb.wiki
comp/src/gb.args
comp/src/gb.desktop
comp/src/gb.eval.highlight
comp/src/gb.gui.base
comp/src/gb.logging
comp/src/gb.map
comp/src/gb.markdown
comp/src/gb.media.form
comp/src/gb.mysql
comp/src/gb.net.pop3
comp/src/gb.net.smtp
examples/examples/{a lot}
[...]
gb.gsl/Test/test
gb.net.curl/src/gb.net.curl
main/lib/db/gb.db

To remove them, I can safely do on my local copy:

$ find -name .startup -exec rm \{\} \;

As always with "find ... -exec rm ..." commands, you should check the files
found on your side beforehand.

Regards,
Tobi

-- 
"There's an old saying: Don't change anything... ever!" -- Mr. Monk