[Ns-developers] code reviews: a short guide
Andrey Mazo
mazo at iitp.ru
Tue Mar 16 06:38:33 PDT 2010
On Fri, 12 Mar 2010 18:49:41 +0300, Mathieu Lacage <mathieu.lacage at sophia.inria.fr> wrote:
> Hrm. I guess that something like that might work:
> - advertise last-pre-reformat changeset id from ns-3-dev
> - run reformat on ns-3-dev chgid
> - commit
>
> And, then, each person who wants to merge would have to:
> - pull from ns-3-dev
> - merge with chgid
> - run reformat
> - commit
> - merge with ns-3-dev post-chgid
> - commit
>
> I guess we would need to try it out on a couple of long-running external
> branches to see if it would work. If it does, I would support doing
> that.
>
> [flamewar about which flags to use for reformater elided]
I've tried this on a relatively large branch with several hacks in various devices and core files.
I've run check-style with "--level=3".
I'm getting about 44% files updated, 28% files merged and 28% files unresolved.
Unresolved conflicts are mostly second encounters of changes, already merged some time ago, but with new indentation.
Though this is not a true nightmare, it's not a pleasant task.
--
Andrey Mazo.
More information about the Ns-developers
mailing list