You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by James Coleman <ja...@dspsrv.com> on 2007/07/13 15:16:32 UTC
[PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work in
some cases?
Hello,
I'd like to submit a patch to the svn faq.
First patch submit (first post to dev!) so please forgive me if I'm making mistakes.
See attached add_svn_switch_issue_2505_to_faq.patch
For your convenience there is a copy of the patched faq.html here:
http://www.dspsrv.com/~jamesc/torture/svn/faq.html#svn-switch-problem
[[[
Add entry in FAQ for issue #2505: Why doesn't svn switch work in some cases?
* www/faq.html
Add svn switch question to index and add FAQ entry at end of Troubleshooting section.
]]]
Attached patch contains:
1. FAQ entry in Troubleshooting (index entry and FAQ entry)
Why doesn't svn switch work in some cases?
Summary of problem and how to avoid the problem.
Examples of problem with errors seen and how to recover from the situation.
2. Two other tiny errors in faq (internal links):
entry in FAQ TOC for #broken-subclipse was missing (nxt to new svn switch entry).
and found a href to #moderated that should be #moderation
I'm VERY sorry for including them in this patch but they really are tiny! :-7
More details on the problem:
We encountered problems using svn switch.
If there are unversioned items in working copy and they have a history on branch being
switched to then the svn switch will stop with an error. User is left with a half-switched
working copy. This is the issue:
http://subversion.tigris.org/issues/show_bug.cgi?id=2505
The very workable solution is to have a rule to only switch from a
''pristine'' clean working copy.
I asked about this svn switch issue on svn users and it does seem
that a couple of people know about this. More info on the users
list here:
http://svn.haxx.se/users/archive-2007-07/index.shtml#276
http://www.google.ie/search?q=+site%3Asvn.haxx.se+-translate+%22Won%27t+delete+locally+modified+directory%22
It is a bit troublesome when users first encounter it and there is very
little info to be found about it. I think that especially larger projects
with lots of parallel development and branches would benefit from having
this documented.
Now, apart from the FAQ entry after testing this more, I am thinking the
issue might be always recoverable from by removing any unversioned files
and continuing with the switch. I added 2 recipies to 2505 and summarised
what I think might be a solution.
Of course there might be a nastier issue buried here but I'm thinking
now that there isn't and this is just a user problem.
Thanks people,
James.
Thanks to people who replied on users list and bug 2505 especially Karl Fogel. :)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work
in some cases?
Posted by James Coleman <ja...@dspsrv.com>.
David Glasser wrote:
> On 7/13/07, James Coleman <ja...@dspsrv.com> wrote:
>> 2. Two other tiny errors in faq (internal links):
>> entry in FAQ TOC for #broken-subclipse was missing (nxt to new svn
>> switch entry).
>> and found a href to #moderated that should be #moderation
>> I'm VERY sorry for including them in this patch but they really
>> are tiny! :-7
>
> Can you send these separately (and with a log message)? As you said,
> they're tiny, so we'd rather just apply them immediately instead of
> having to wait on making sure that the explanation of the complicated
> problem is ready to commit.
>
> --dave
>
>
Way to go me. :(
No patch and then disappear :(
Thank you all for bearing with me and being very kind! :)
Thank you very much Karl! Sorry you had to extract it.
I see the patch is applied with corrections. Very happy it looks nice :)
Original patch attached here for reference.
James
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work in some cases?
Posted by David Glasser <gl...@mit.edu>.
On 7/13/07, James Coleman <ja...@dspsrv.com> wrote:
> 2. Two other tiny errors in faq (internal links):
> entry in FAQ TOC for #broken-subclipse was missing (nxt to new svn switch entry).
> and found a href to #moderated that should be #moderation
> I'm VERY sorry for including them in this patch but they really are tiny! :-7
Can you send these separately (and with a log message)? As you said,
they're tiny, so we'd rather just apply them immediately instead of
having to wait on making sure that the explanation of the complicated
problem is ready to commit.
--dave
--
David Glasser | glasser@mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work
in some cases?
Posted by James Coleman <ja...@dspsrv.com>.
Eli Carter wrote:
> On Friday 13 July 2007, David Glasser wrote:
>> I think you forgot to attach the patch!
>>
>> --dave, who thinks email clients should warn you before you send
>> attachment-free mail containing the word "attached"...
>
> kmail does... ;)
>
> Settings -> Configure Kmail
> Composer -> Attachments
> 'Enable detection of missing attachments'
> ... even lets you specify the strings it should watch for.
> (And I believe it's enabled by default.)
>
> Eli
>
Hi Eli :)
For Thunderbird I'm going to try this: Check and Send:
https://addons.mozilla.org/en-US/thunderbird/addon/2281
Excellent! :) I had to configure it and add list of attach keywords but
it won't send this mail without confirming :) Lots of yellow highlighting.
My internal paranoid over-shoulder watcher has not been good last week.
With root too :(
It's very twitchy now though.
James.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work in some cases?
Posted by Eli Carter <el...@commprove.com>.
On Friday 13 July 2007, David Glasser wrote:
> I think you forgot to attach the patch!
>
> --dave, who thinks email clients should warn you before you send
> attachment-free mail containing the word "attached"...
kmail does... ;)
Settings -> Configure Kmail
Composer -> Attachments
'Enable detection of missing attachments'
... even lets you specify the strings it should watch for.
(And I believe it's enabled by default.)
Eli
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work in some cases?
Posted by David Glasser <gl...@mit.edu>.
On 7/13/07, James Coleman <ja...@dspsrv.com> wrote:
> Hello,
>
> I'd like to submit a patch to the svn faq.
> First patch submit (first post to dev!) so please forgive me if I'm making mistakes.
> See attached add_svn_switch_issue_2505_to_faq.patch
I think you forgot to attach the patch!
--dave, who thinks email clients should warn you before you send
attachment-free mail containing the word "attached"...
--
David Glasser | glasser@mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work
in some cases?
Posted by James Coleman <ja...@dspsrv.com>.
Karl Fogel wrote:
> James Coleman <ja...@dspsrv.com> writes:
>> I'd like to submit a patch to the svn faq.
>> First patch submit (first post to dev!) so please forgive me if I'm making mistakes.
>> See attached add_svn_switch_issue_2505_to_faq.patch
>> For your convenience there is a copy of the patched faq.html here:
>> http://www.dspsrv.com/~jamesc/torture/svn/faq.html#svn-switch-problem
>>
>> [[[
>> Add entry in FAQ for issue #2505: Why doesn't svn switch work in some cases?
>>
>> * www/faq.html
>> Add svn switch question to index and add FAQ entry at end of Troubleshooting section.
>> ]]]
>>
>> Attached patch contains:
>>
>> 1. FAQ entry in Troubleshooting (index entry and FAQ entry)
>> Why doesn't svn switch work in some cases?
>> Summary of problem and how to avoid the problem.
>> Examples of problem with errors seen and how to recover from the situation.
>>
>> 2. Two other tiny errors in faq (internal links):
>> entry in FAQ TOC for #broken-subclipse was missing (nxt to new svn switch entry).
>> and found a href to #moderated that should be #moderation
>> I'm VERY sorry for including them in this patch but they really are tiny! :-7
>
> I think you forgot to attach the actual patch :-).
>
> But that's okay, I grabbed the full file.
>
> Please see r25732, r25733, r25734, r25735, and r25736, which show the
> importance of submitting logically separate changes as separate
> patches, each with their own log message. I did my best to untangle
> all the changes in this one patch, but (as you can see from the logs)
> I still messed it up, and had to make corrections later.
>
> I didn't want to ask you to resubmit this time, since you put so much
> work into writing the new FAQ entry already (thanks!). But please,
> next time, do follow the guidelines, they're there for a reason :-).
>
> Best,
> -Karl
Again thanks for doing this and bearing with me!
I see from the logs you had some fun too :-7
Yes I will send patches individually if I do it again.
It would have been easier for me just to take a little extra time.
As two of the changes were right next to each other the second patch would have to
have included and be dependant on first patch.
It was taking me so long not alone getting faq entry right but also
writing emails. And in composing the faq entry and testing I found
out more about the problem and content of faq entry/emails had to
change more! :-P
fun! :)
James.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] issue #2505: Add FAQ entry: Why doesn't svn switch work in some cases?
Posted by Karl Fogel <kf...@red-bean.com>.
James Coleman <ja...@dspsrv.com> writes:
> I'd like to submit a patch to the svn faq.
> First patch submit (first post to dev!) so please forgive me if I'm making mistakes.
> See attached add_svn_switch_issue_2505_to_faq.patch
> For your convenience there is a copy of the patched faq.html here:
> http://www.dspsrv.com/~jamesc/torture/svn/faq.html#svn-switch-problem
>
> [[[
> Add entry in FAQ for issue #2505: Why doesn't svn switch work in some cases?
>
> * www/faq.html
> Add svn switch question to index and add FAQ entry at end of Troubleshooting section.
> ]]]
>
> Attached patch contains:
>
> 1. FAQ entry in Troubleshooting (index entry and FAQ entry)
> Why doesn't svn switch work in some cases?
> Summary of problem and how to avoid the problem.
> Examples of problem with errors seen and how to recover from the situation.
>
> 2. Two other tiny errors in faq (internal links):
> entry in FAQ TOC for #broken-subclipse was missing (nxt to new svn switch entry).
> and found a href to #moderated that should be #moderation
> I'm VERY sorry for including them in this patch but they really are tiny! :-7
I think you forgot to attach the actual patch :-).
But that's okay, I grabbed the full file.
Please see r25732, r25733, r25734, r25735, and r25736, which show the
importance of submitting logically separate changes as separate
patches, each with their own log message. I did my best to untangle
all the changes in this one patch, but (as you can see from the logs)
I still messed it up, and had to make corrections later.
I didn't want to ask you to resubmit this time, since you put so much
work into writing the new FAQ entry already (thanks!). But please,
next time, do follow the guidelines, they're there for a reason :-).
Best,
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org