Re: svn commit: rev 4699 - trunk/subversion/libsvn_client

[Garrett Rooney <ro...@electricjellyfish.net>]

On Saturday, February 1, 2003, at 11:44 AM, rooneg@tigris.org wrote:

> Author: rooneg
> Date: 2003-02-01 10:43:42 -0600 (Sat, 01 Feb 2003)
> New Revision: 4699
>
> Modified:
>    trunk/subversion/libsvn_client/diff.c
> Log:
> for consistency, refactor the single file merge code to use the same 
> callback
> functions the rest of the merge code uses.

note that there's still a problem here that i'm investigating.  merging 
of property changes in the single file case appears to be broken, and i 
have no clue why.  i reverted back to revision 4682 of 
libsvn_client/diff.c, and it still didn't work, so i'm reasonably 
certain i didn't break this, but it definately doesn't work.

what's really confusing me is that the notification callback appears to 
be getting called with the correct results in both cases (merging a 
single file with a prop change and merging the directory that file 
lives in), so the code seems to think that the properties are getting 
merged in both cases, but in the single file case nothing ends up 
getting merged, and an 'svn st' after the merge shows no change to the 
file's props at all.

(note that this is only properties, text changes are getting merged 
fine in both cases.)

if anyone has any idea what could cause this, i'd love to hear it.

oh, and as philip pointed out, this stuff still needs unit tests, so if 
anyone out there is feeling motivated, please feel free.

-garrett


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: rev 4699 - trunk/subversion/libsvn_client

[Garrett Rooney <ro...@electricjellyfish.net>]

On Saturday, February 1, 2003, at 12:57 PM, Philip Martin wrote:

> Garrett Rooney <ro...@electricjellyfish.net> writes:
>
>> what's really confusing me is that the notification callback appears
>> to be getting called with the correct results in both cases (merging a
>> single file with a prop change and merging the directory that file
>> lives in), so the code seems to think that the properties are getting
>> merged in both cases, but in the single file case nothing ends up
>> getting merged, and an 'svn st' after the merge shows no change to the
>> file's props at all.
>
> Sounds something like issue 1109.

ahh, fantastic, then i will leave it in david's capable hands, as i'm 
completely confused by it at this point.

-garrett


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: rev 4699 - trunk/subversion/libsvn_client

[Philip Martin <ph...@codematters.co.uk>]

Garrett Rooney <ro...@electricjellyfish.net> writes:

> what's really confusing me is that the notification callback appears
> to be getting called with the correct results in both cases (merging a
> single file with a prop change and merging the directory that file
> lives in), so the code seems to think that the properties are getting
> merged in both cases, but in the single file case nothing ends up
> getting merged, and an 'svn st' after the merge shows no change to the
> file's props at all.

Sounds something like issue 1109.

-- 
Philip Martin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org