Re: cmpilato's merge

Kevin Pilch-Bisson <kevin@pilch-bisson.net> writes:

> At Ben C-S's suggestion, I attempted to merge the branch into trunk a
> different way then cmpilato. Then I diffed my wc against this checkin.

First of all, thank you *very much* for doing this.

> Here's the diff, maybe mike can make sure everything looks happy?
>
>
> Index: ./subversion/libsvn_fs/nodes-table.c
> ===================================================================
...

This was legitimate badness in the branch, that somehow managed to get
missed.

> Index: ./subversion/libsvn_fs/tree.c
> ===================================================================
...

This is my fault. At the time I resolved the conflicts in this file,
the conflict area was so big that I simply #if 0'd out the version I
thought was wrong. I forgot to clean this up after making sure all
was well (and hereby note to myself that I need to clean this up).

> Index: ./subversion/libsvn_fs/fs_skels.c
> ===================================================================
...

Hm...I need to check on this one.

> Index: ./subversion/libsvn_repos/reporter.c
> ===================================================================
...

I think this one is okay.

> Index: ./subversion/libsvn_repos/delta.c
> ===================================================================
...

This is fine, too. You and I just chose to resolve our conflicts with
slightly different formatting.

Thanks again!

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 5 21:41:58 2002