You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Shlomi Fish <sh...@vipe.stud.technion.ac.il> on 2003/08/08 12:45:44 UTC
[PATCH] Issue #1297 Fix - Rev. 5
Check:
http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev5.patch.txt
for the patch. The log is:
<<<
Resolves Issue #1297 ('svn diff' after 'svn merge' that adds a file fails)
and other misbehaviours. (such as svn diff after a 'svn copy' of file).
* include/svn_wc.h
Added the declaration of svn_wc_put_repos_file_in_wc.
* libsvn_wc/update_editor.c
Added the svn_wc_put_repos_file_in_wc function that puts a file
in the working copy and set its text-base, props and prop-base.
* libsvn_client/copy.c
Added the function put_file_helper that serves as the callback to
put_repos_file_in_wc.
(repos_to_wc_copy): in the file case, replaced the broken logic with
a call to svn_wc_put_repos_file_in_wc. Also, removed setting the properties
, which is done by put_repos as it is.
>>>
I applied the changes based on Sander Striker's commentary, so now
everything should be fine. I still want to write some tests to check if
the eol and keywords properties are correctly applied to the text base.
Regards,
Shlomi Fish
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: [PATCH] Issue #1297 Fix - Rev. 5
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
On Sun, 10 Aug 2003, Sander Striker wrote:
> > From: Shlomi Fish [mailto:shlomif@vipe.technion.ac.il]
> > Sent: Friday, August 08, 2003 2:46 PM
>
> > Check:
> >
> > http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev5.patch.txt
> >
> > for the patch. The log is:
>
> Hi,
>
> I've minorly tweaked the patch and applied it. Thanks for being so
> persistent/patient Shlomi!
>
And thank you for applying it.
Regards,
Shlomi Fish
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Issue #1297 Fix - Rev. 5
Posted by kf...@collab.net.
Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> > Whoo-hoo!
> >
> > What issue do you want next, Shlomi? :-)
>
> Hmmm... I've been looking in the direction of issue #1196:
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=1196
>
> Namely, that a file that was moved in the repository is still updated on
> an svn update from a different working copy. What I don't understand is
> whether it also applies to deleted or moved directories.
>
> Would you recommend that I try to tackle it, or should I find an easier
> issue?
1196 is really complex (not necessarily to solve, just to figure out
what the right behavior is!). Although it's assigned to me, I'm
planning to discuss it with Ben and Mike here in the office, to make
sure that at least two other heads are comfortable with a solution.
So I'd recommend tackling an easier issue, yes, or at least one where
the solution is immediately clear ("fix the bug" rather than "choose a
new behavior" :-) ).
Okay, I'm off to look at issue #1313 and your patch...
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by kf...@collab.net.
Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> Yes, but when I update the patch, if I invoke svn diff >> logfile.txt on
> the existing log+patch file, I'll get a second patch appended to the file.
> OTOH, if I do svn diff > patch.txt, I will overwrite the patch.
Look, it's no big deal.
If you find it *that* inconvenient to put the patch and the log
message in the same file, then use two :-). I'm just indicating
what's easiest for us consumers (remember, there are N consumers for
every 1 producer; something to think about when evaluating the
cost/benefit of packing things conveniently for the consumers).
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
On Mon, 11 Aug 2003, John Peacock wrote:
> Shlomi Fish wrote:
>
> >
> > Oh OK. It's still easier for me to maintain the files my way, because then
> > I can simply redirect svn diff to the file and write the log in a separate
> > message.
> >
>
> Write the log message as you go (good policy, since you don't forget anything),
> then 'svn diff ... >> logfile.txt' when you are ready to submit. TMTOWTDI
>
Yes, but when I update the patch, if I invoke svn diff >> logfile.txt on
the existing log+patch file, I'll get a second patch appended to the file.
OTOH, if I do svn diff > patch.txt, I will overwrite the patch.
Regards,
Shlomi Fish
> John
>
>
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev.
5]
Posted by John Peacock <jp...@rowman.com>.
Shlomi Fish wrote:
>
> Oh OK. It's still easier for me to maintain the files my way, because then
> I can simply redirect svn diff to the file and write the log in a separate
> message.
>
Write the log message as you go (good policy, since you don't forget anything),
then 'svn diff ... >> logfile.txt' when you are ready to submit. TMTOWTDI
John
--
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
On Mon, 11 Aug 2003 kfogel@collab.net wrote:
> Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> > I'd rather not. It makes it more difficult to apply the patch.
>
> Have you tried it? :-) The 'patch' program just ignores the non-patch
> portion.
>
Oh OK. It's still easier for me to maintain the files my way, because then
I can simply redirect svn diff to the file and write the log in a separate
message.
> > add-config-dir.patch.txt and add-config-dir.log.txt are no longer valid
> > and rather broken.
>
> Then no reason to keep them in the dir...
>
Removed.
> > Use add-config-dir-rev2. What this patch does is add
> > a --config-dir option to the command line clients (and underlying
> > libraries) to specify an alternative directory where one can find the
> > configuration files. It helps for Issue #1385:
> >
> > http://subversion.tigris.org/issues/show_bug.cgi?id=1385
> >
> > and may be usable in other cases.
>
> Thanks. I'd recommend just naming the patch after 1385, and making a
> comment in the issue.
>
There is already a comment in the issue. I added an issue-1385.html file
that links to the patch and log of add-config-dir.
Regards,
Shlomi Fish
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by kf...@collab.net.
Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> I'd rather not. It makes it more difficult to apply the patch.
Have you tried it? :-) The 'patch' program just ignores the non-patch
portion.
> add-config-dir.patch.txt and add-config-dir.log.txt are no longer valid
> and rather broken.
Then no reason to keep them in the dir...
> Use add-config-dir-rev2. What this patch does is add
> a --config-dir option to the command line clients (and underlying
> libraries) to specify an alternative directory where one can find the
> configuration files. It helps for Issue #1385:
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=1385
>
> and may be usable in other cases.
Thanks. I'd recommend just naming the patch after 1385, and making a
comment in the issue.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by Sander Striker <st...@apache.org>.
> From: Shlomi Fish [mailto:shlomif@vipe.technion.ac.il]
> Sent: Monday, August 11, 2003 5:40 PM
> On Mon, 11 Aug 2003 kfogel@collab.net wrote:
>> 1) Put log message and patch in the same file, so there's exactly
>> one file per patch.
>
> I'd rather not. It makes it more difficult to apply the patch.
Not it doesn't. 'patch' is very well capable of ignoring non patch parts.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
On Mon, 11 Aug 2003 kfogel@collab.net wrote:
> Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> > OK, I removed the patches that were already applied from my patches
> > directory, and now it contains only unapplied patches (4 of them so far).
> >
> > The URL is as always:
> >
> > http://t2.technion.ac.il/~shlomif/svn-patches/
>
> Thanks, I took a look. A couple of quick suggestions:
>
> 1) Put log message and patch in the same file, so there's exactly
> one file per patch.
>
I'd rather not. It makes it more difficult to apply the patch.
> 2) When the patch is for an issue, make a note in the issue
> giving the URL for the (single) patch file.
>
OK.
> Regarding the specific patches:
>
> Are these for an open issue?:
>
> add-config-dir-rev2...> 10-Aug-2003 11:40 2k
> add-config-dir-rev2...> 10-Aug-2003 11:40 36k
> add-config-dir.log.txt 10-Aug-2003 11:40 1k
> add-config-dir.patch..> 10-Aug-2003 11:40 23k
>
add-config-dir.patch.txt and add-config-dir.log.txt are no longer valid
and rather broken. Use add-config-dir-rev2. What this patch does is add
a --config-dir option to the command line clients (and underlying
libraries) to specify an alternative directory where one can find the
configuration files. It helps for Issue #1385:
http://subversion.tigris.org/issues/show_bug.cgi?id=1385
and may be usable in other cases.
> This one is for a Post-1.0 issue (the patch looks good to me, by the
> way; I'd like for Sander Striker, Justin Erenkrantz, or some other
> APR/Apache/HTTP-knowledgeable person to glance at it, but I think it
> can & should be applied):
>
> issue-1209-fix.log.txt 10-Aug-2003 11:40 1k
> issue-1209-fix.patch..> 10-Aug-2003 11:40 1k
>
> This issue is closed, MBK has applied your patch:
>
> issue-1266-fix.log.txt 10-Aug-2003 11:40 1k
> issue-1266-fix.patch..> 10-Aug-2003 11:40 1k
>
So I see. OK, I'll remove them from the collection.
> This issue is assigned to me, so I'll review your patch right away
> (and I'll link to your patch in the issue, you don't need to do it):
>
> issue-1313-fix.log.txt 10-Aug-2003 11:40 1k
> issue-1313-fix.patch..> 10-Aug-2003 11:40 3k
>
OK.
> Thanks,
> -Karl
>
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by kf...@collab.net.
Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> OK, I removed the patches that were already applied from my patches
> directory, and now it contains only unapplied patches (4 of them so far).
>
> The URL is as always:
>
> http://t2.technion.ac.il/~shlomif/svn-patches/
Thanks, I took a look. A couple of quick suggestions:
1) Put log message and patch in the same file, so there's exactly
one file per patch.
2) When the patch is for an issue, make a note in the issue
giving the URL for the (single) patch file.
Regarding the specific patches:
Are these for an open issue?:
add-config-dir-rev2...> 10-Aug-2003 11:40 2k
add-config-dir-rev2...> 10-Aug-2003 11:40 36k
add-config-dir.log.txt 10-Aug-2003 11:40 1k
add-config-dir.patch..> 10-Aug-2003 11:40 23k
This one is for a Post-1.0 issue (the patch looks good to me, by the
way; I'd like for Sander Striker, Justin Erenkrantz, or some other
APR/Apache/HTTP-knowledgeable person to glance at it, but I think it
can & should be applied):
issue-1209-fix.log.txt 10-Aug-2003 11:40 1k
issue-1209-fix.patch..> 10-Aug-2003 11:40 1k
This issue is closed, MBK has applied your patch:
issue-1266-fix.log.txt 10-Aug-2003 11:40 1k
issue-1266-fix.patch..> 10-Aug-2003 11:40 1k
This issue is assigned to me, so I'll review your patch right away
(and I'll link to your patch in the issue, you don't need to do it):
issue-1313-fix.log.txt 10-Aug-2003 11:40 1k
issue-1313-fix.patch..> 10-Aug-2003 11:40 3k
Thanks,
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
My Unapplied Patches [was Re: [PATCH] Issue #1297 Fix - Rev. 5]
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
OK, I removed the patches that were already applied from my patches
directory, and now it contains only unapplied patches (4 of them so far).
The URL is as always:
http://t2.technion.ac.il/~shlomif/svn-patches/
Regards,
Shlomi Fish
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Issue #1297 Fix - Rev. 5
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
On Sun, 9 Aug 2003 kfogel@collab.net wrote:
> "Sander Striker" <st...@apache.org> writes:
> > > From: Shlomi Fish [mailto:shlomif@vipe.technion.ac.il]
> > > Check:
> > >
> > > http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev5.patch.txt
> > >
> > > for the patch. The log is:
> >
> > Hi,
> >
> > I've minorly tweaked the patch and applied it. Thanks for being so
> > persistent/patient Shlomi!
>
> Whoo-hoo!
>
> What issue do you want next, Shlomi? :-)
>
Hmmm... I've been looking in the direction of issue #1196:
http://subversion.tigris.org/issues/show_bug.cgi?id=1196
Namely, that a file that was moved in the repository is still updated on
an svn update from a different working copy. What I don't understand is
whether it also applies to deleted or moved directories.
Would you recommend that I try to tackle it, or should I find an easier
issue?
Other than that, some of my patches in:
http://t2.technion.ac.il/~shlomif/svn-patches/
were not applied yet.
Note that I'm probably going to get a day-job now, (tfu, tfu, tfu) so I
won't have as much free time as I had. This may affect my input of
Subversion contributions.
Regards,
Shlomi Fish
> -K
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Issue #1297 Fix - Rev. 5
Posted by kf...@collab.net.
"Sander Striker" <st...@apache.org> writes:
> > From: Shlomi Fish [mailto:shlomif@vipe.technion.ac.il]
> > Check:
> >
> > http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev5.patch.txt
> >
> > for the patch. The log is:
>
> Hi,
>
> I've minorly tweaked the patch and applied it. Thanks for being so
> persistent/patient Shlomi!
Whoo-hoo!
What issue do you want next, Shlomi? :-)
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: [PATCH] Issue #1297 Fix - Rev. 5
Posted by Sander Striker <st...@apache.org>.
> From: Shlomi Fish [mailto:shlomif@vipe.technion.ac.il]
> Sent: Friday, August 08, 2003 2:46 PM
> Check:
>
> http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev5.patch.txt
>
> for the patch. The log is:
Hi,
I've minorly tweaked the patch and applied it. Thanks for being so
persistent/patient Shlomi!
Sidenote: Function naming isn't one of my strong abilities (Hi Ryan! ;), so if
someone would care to change the function names I won't object. I changed
the original name Shlomi submitted to something a whee bit smaller, FWIW.
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org