Hi Julian,
Thanks for the review. I have some problem in committing via my ASF account(Sent a mail to infrastructure_at_apache.org) will commit after that.
Kannan Rengarajan was working on writing a testcase for this so I leave it to him.
With regards
Kamesh Jayachandran
-----Original Message-----
From: Julian Foad [mailto:julianfoad_at_btopenworld.com]
Sent: Fri 12/4/2009 11:56 PM
To: Kamesh Jayachandran
Cc: dev_at_subversion.tigris.org
Subject: Re: [PATCH] incoming copy of locally modified file(under repo_root) is not receiving the local modification
Kamesh Jayachandran wrote:
> I observed the following bug when I was working with the file under repo
> root.
[...]
> $svnadmin create repo
> $svn co file://`pwd`/repo wc
> $cd wc
> $echo "I am test.c" >test.c
> $svn add test.c
> $svn ci -m "log"
> $svn mv test.c test2.c
> $svn ci -m "refactor"
> $cd ..
> $svn co -r1 file://`pwd`/repo wc2
> $cd wc2
> $echo "modified" >>test.c
>
>
> $svn up
>
> The above svn update is not adding the 'modified' change to test2.c.
>
> Everything works fine if the files are *not* directly under repo root.
That looks like a good catch. Thanks.
Please could you add the test scenario into one of the regression tests?
If you could, that would be very helpful.
> Attached patch fixes it.
>
> I ran test against ra_local, *no* failure with this patch. Hope this fix
> is independent of ra layer and hence sending it without testing against
> each layer.
>
> If there are no objections will commit it by tomorrow.
> [[[
> incoming copy of locally modified file(under repo_root) is not
> receiving the
> local modification.
> * subversion/libsvn_wc/update_editor.c
> (locate_copyfrom): No need of early return for files under
> repo_root.
> ]]]
Please could you try to make the log message a bit clearer. The first
sentence needs the word "update" in it. The details should say what
behaviour you changed. ("No need..." just sounds like something was
being done that didn't make any difference.) Maybe something like:
[[[
Fix a bug in which "update" did not preserve the local changes in
a file when the incoming change is a simple rename, if the file was
directly under the repository root. If the file was not immediately
under the root, it did.
There is a test case in the email thread
<http://...>.
* subversion/libsvn_wc/update_editor.c
(locate_copyfrom): Remove an erroneous early return.
]]]
Thanks.
- Julian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2427172
Please start new threads on the <dev_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <dev-subscribe_at_subversion.apache.org>.
Received on 2009-12-04 20:09:01 CET