Op 2010-06-13 14:35, Jonas Maebe het geskryf:
>
> svn merge (either an url or a local checkout) conflicts> svn resolved svn ci
Thanks, I made a note of that.
> The harder part was resolving the conflicts. The merged version has been
> committed in r15421, I hope that I didn't break anything
On 10 Jun 2010, at 14:41, Graeme Geldenhuys wrote:
> My knowledge of SubVersion has degraded rapidly. Could somebody with more
> knowledge/confidence of SVN bring cpstrnew branch in sync with Trunk.
The merge commands are very simple:
svn merge (either an url or a local checkout)
svn resolved
On Thu, 10 Jun 2010, Jonas Maebe wrote:
What is the coding standards in FPC?
In general: http://wiki.freepascal.org/Coding_style
As you'll notice, many things are not defined, such as identifier naming.
There are no fixed rules for those things, but it is recommended to keep
things simila
Op 2010-06-10 14:17, Jonas Maebe het geskryf:
>
> And I don't know what "cherry picking" is. r14005 has to be reverted,
> and then the entire branch should be brought up-to-date by merging
I take it you meant r15401. "cherry picking" is taking the same commit from
another branch and merge it in
On 10 Jun 2010, at 14:03, Graeme Geldenhuys wrote:
Op 2010-06-10 13:45, Vincent Snijders het geskryf:
I think it would be better to revert it and apply the changes from
r14005, so that
it can be merged more easily.
Can I simply change the 'lEquals' to 'aequals' in a new commit,
No, tha
Op 2010-06-10 14:13, Michael Van Canneyt het geskryf:
>
> There are no official coding standards. Just one important guideline:
> don't change someone else's code style "just to change it".
OK thanks. I knew about that rule, and just to be clear, that wasn't the
reason for r15401.
Regards,
-
On Thu, 10 Jun 2010, Graeme Geldenhuys wrote:
Op 2010-06-10 13:45, Vincent Snijders het geskryf:
I think it would be better to revert it and apply the changes from r14005, so
that
it can be merged more easily.
Can I simply change the 'lEquals' to 'aequals' in a new commit, or must one
do
Op 2010-06-10 13:45, Vincent Snijders het geskryf:
>
> I think it would be better to revert it and apply the changes from r14005, so
> that
> it can be merged more easily.
Can I simply change the 'lEquals' to 'aequals' in a new commit, or must one
do some r14005 cherry-pick (I don't know the SV
I just reviewed r15401:
http://svn.freepascal.org/cgi-bin/viewvc.cgi?view=rev&revision=15401
I think it would be better to revert it and apply the changes from r14005, so that
it can be merged more easily.
http://svn.freepascal.org/cgi-bin/viewvc.cgi/trunk/compiler/nobj.pas?r1=14004&r2=14005
V
