Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / lazarus / 2011-01

Lazarus main lpi generates svn conflicts

7 messages · 5 people · –

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Alexsander Rosa

Is there a way to allow a team open the same project in Lazarus (each coder editing a different form) without the constant conflicts on SVN in the main .lpi file? Maybe a project option or something?

Atenciosamente, Alexsander da Rosa Linux User #113925 "Extremismo na defesa da liberdade n?o ? defeito. Modera??o na busca por justi?a n?o ? virtude." -- Barry Goldwater -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110124/45dc2c90/attachment.html>
Henry Vermaak
to Alexsander Rosa
Alexsander Rosa wrote
Is there a way to allow a team open the same project in Lazarus (each coder editing a different form) without the constant conflicts on SVN in the main .lpi file? Maybe a project option or something?

You can choose to save the session info into a different file that you don't check in, which helps. See the options in Project Options -> Session.

Henry

Mattias Gaertner
to Alexsander Rosa: Is there a way to allow a team open the same project in Lazarus (each coder editing a…

?
?

Alexsander Rosa hat am 24. Januar 2011 um 14:48
geschrieben:

Is there a way to allow a team open the same project in Lazarus (each coder editing a different form) without the constant conflicts on SVN in the main .lpi file? Maybe a project option or something?

?
Save the session information to a separate file:

Project / Project Options / Session / Save in .lps file

or Save in IDE config directory.

Mattias
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110124/604e6aee/attachment.html>

Alexsander Rosa
to Mattias Gaertner

Thanks Henry and Mattias!

2011/1/24 Mattias Gaertner

Show quoted text 29 lines
Alexsander Rosa hat am 24. Januar 2011 um 14:48 geschrieben: Is there a way to allow a team open the same project in Lazarus (each coder editing a different form) without the constant conflicts on SVN in the main .lpi file? Maybe a project option or something? Save the session information to a separate file: Project / Project Options / Session / Save in .lps file or Save in IDE config directory. Mattias -- _______________________________________________ Lazarus mailing list http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Atenciosamente, Alexsander da Rosa Linux User #113925 "Extremismo na defesa da liberdade n?o ? defeito. Modera??o na busca por justi?a n?o ? virtude." -- Barry Goldwater -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110124/d4bb6dc4/attachment.html>
Mattias Gaertner
to Burkhard Carstens
Show quoted text 8 lines
> ? > Save the session information to a separate file: > > Project / Project Options / Session / Save in .lps file IMO this should be default. It's very anoying to set this each time I create a new project.

For every of the four choices you will find developers/projects. You can set it default (the checkbox at the bottom).

> or Save in IDE config directory. ?

Useful if the source directory is read only or if you do not want any lps file in the directory.

Mattias