Re: [patches] RFA: Use cross nm in NPTL tests

["Carlos O'Donell" <carlos@xxxxxxxxxxxxxxxx>]

On 1/31/07, Jim Blandy <jimb@xxxxxxxxxxxxxxxx> wrote:
> > Jim,
> >
> > Why are we commenting out code instead of removing it?
>
> Which do you think would be better?  My concern is ease of merging: a
> deleted line doesn't look like anything, and 'svn annotate' isn't
> helpful in finding deletions.  So a conflict between an imported
> change and one of these changes would take more effort to sort out
> than it would if the conditional had simply been commented out.

I consider "svn annotate" nothing more than a toy. It doesn't do much
of anything.

If you delete the line you should get the following on a merge:

<<<<<<< .working
=======
changed line
> > > > > > > .merge-right.rXXXXX

If you keep the line you should get the following on a merge:

<<<<<<< .working
# old line
=======
changed line
> > > > > > > .merge-right.rXXXXX

You are saying that "# old line" gives you context
about the previous FSF state of the code, and through
this context the merge will be easier?

I buy that.

Keep up the good work! :-)

Cheers,
Carlos.