You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jonathan Derryberry <jo...@gmail.com> on 2009/07/16 23:10:16 UTC
bug with renaming a nonempty folder?
I tried to rename a nonempty folder and then update, and a tree
conflict resulted. I've worked for a while on a way to get around it
to no avail. I'm using Vista with the current version of tortoisesvn
to perform the operations. This potential bug can be produced by
adding an empty folder (say "foo") to a working copy, adding a new
text file "bar.txt" into folder "foo". Then renaming foo to "foo2" and
updating causes a tree conflict. Is this a known issue or bug?
-Jon
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371909
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: bug with renaming a nonempty folder?
Posted by Jonathan Derryberry <jo...@gmail.com>.
On Fri, Jul 17, 2009 at 12:47 AM, Ryan
Schmidt<su...@ryandesign.com> wrote:
>
> On Jul 16, 2009, at 20:46, Jonathan Derryberry wrote:
>
>> no, i do:
>>
>> mkdir a
>> touch a/b
>> svn commit
>> svn mv a c
>> svn up
>>
>> That causes a tree conflict.
>
> Is that transcript complete? "svn mv a c" in this case shouldn't work since
> "a" has never been added.
>
>
>
Yeah, there's an add. Sorry, that's not directly copied from the
command line because I was using tortoisesvn, which is just supposed
to wrap those commands.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2372101
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: bug with renaming a nonempty folder?
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jul 16, 2009, at 20:46, Jonathan Derryberry wrote:
> no, i do:
>
> mkdir a
> touch a/b
> svn commit
> svn mv a c
> svn up
>
> That causes a tree conflict.
Is that transcript complete? "svn mv a c" in this case shouldn't work
since "a" has never been added.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371953
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: bug with renaming a nonempty folder?
Posted by Jonathan Derryberry <jo...@gmail.com>.
no, i do:
mkdir a
touch a/b
svn commit
svn mv a c
svn up
That causes a tree conflict.
On Thu, Jul 16, 2009 at 9:34 PM, Tyler Roscoe<ty...@cryptio.net> wrote:
> Please don't top-post.
>
> On Thu, Jul 16, 2009 at 09:32:25PM -0400, Jon Derryberry wrote:
>> Sorry, I meant that both the folder and text file were created in the
>> working copy and then committed, and then the folder was renamed. That
>> is what causes the problem. Thanks.
>
> So you do:
>
> svn mv foo foo2
> svn up
>
> ?
>
> Here again you should do:
>
> svn mv foo foo2
> svn commit
> svn up
>
>
> hth,
> tyler
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371932
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: bug with renaming a nonempty folder?
Posted by Tyler Roscoe <ty...@cryptio.net>.
Please don't top-post.
On Thu, Jul 16, 2009 at 09:32:25PM -0400, Jon Derryberry wrote:
> Sorry, I meant that both the folder and text file were created in the
> working copy and then committed, and then the folder was renamed. That
> is what causes the problem. Thanks.
So you do:
svn mv foo foo2
svn up
?
Here again you should do:
svn mv foo foo2
svn commit
svn up
hth,
tyler
Re: bug with renaming a nonempty folder?
Posted by Jonathan Derryberry <jo...@gmail.com>.
Sorry, I meant that both the folder and text file were created in the
working copy and then committed, and then the folder was renamed. That
is what causes the problem. Thanks.
On Thu, Jul 16, 2009 at 9:27 PM, Tyler Roscoe<ty...@cryptio.net> wrote:
> On Thu, Jul 16, 2009 at 07:10:16PM -0400, Jonathan Derryberry wrote:
>> I tried to rename a nonempty folder and then update, and a tree
>> conflict resulted. I've worked for a while on a way to get around it
>> to no avail. I'm using Vista with the current version of tortoisesvn
>> to perform the operations. This potential bug can be produced by
>> adding an empty folder (say "foo") to a working copy, adding a new
>> text file "bar.txt" into folder "foo". Then renaming foo to "foo2" and
>> updating causes a tree conflict. Is this a known issue or bug?
>
> I have never had good luck with moving things around that weren't
> committed. I recommend committing after you add a directory and before
> moving that directory around.
>
> The smarter people might have more to say on this matter.
>
> tyler
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2371930
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: bug with renaming a nonempty folder?
Posted by Tyler Roscoe <ty...@cryptio.net>.
On Thu, Jul 16, 2009 at 07:10:16PM -0400, Jonathan Derryberry wrote:
> I tried to rename a nonempty folder and then update, and a tree
> conflict resulted. I've worked for a while on a way to get around it
> to no avail. I'm using Vista with the current version of tortoisesvn
> to perform the operations. This potential bug can be produced by
> adding an empty folder (say "foo") to a working copy, adding a new
> text file "bar.txt" into folder "foo". Then renaming foo to "foo2" and
> updating causes a tree conflict. Is this a known issue or bug?
I have never had good luck with moving things around that weren't
committed. I recommend committing after you add a directory and before
moving that directory around.
The smarter people might have more to say on this matter.
tyler