kdelibs splitting: April iteration
Stephen Kelly
steveire at gmail.com
Sun Apr 8 08:40:15 UTC 2012
David Faure wrote:
> On Saturday 07 April 2012 16:51:25 Stephen Kelly wrote:
>> which is move files
>> and update CMakeLists and export in separate commits.
>
> That was on purpose, to make commits reviewable.
>
> It's impossible to review a commit which moves code *and* modifies it.
> Better have two separate commits for that.
This sounds like a tools problem.
If you get the patch to be reviewed into a git repo, you can use gitk to
show you the patch with copies and renames 'squashed', so it shows the diff
between the renamed files.
I know you don't use gitk though, so you can use git show -M abcd1234 to
show moves, and -C to show copies. See git help log for info about the
options.
Taking it one step further:
[alias]
review = show -C -C -M
$ git review
$ git review abcd1234
> I don't see the problem with
> "but then the intermediate step doesn't build". We just never go back to
> that step.
>
Unless an automated tool like git bisect brings us there. When it's every
(second) commit that doesn't build, it could become a problem.
>
> Thanks for the merging effort, in any case, glad that I'll be able to just
> continue in the main branch.
Great. Hopefully we can get a stronger definition of what kwidgets is
supposed to be.
Thanks,
Steve.
More information about the Kde-frameworks-devel
mailing list