You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Barry Scott <ba...@barrys-emacs.org> on 2010/02/25 22:30:18 UTC
Tree conflict - svn status cannot show?
I starting to see failures to commit because of tree conflicts.
svn status does not seem to show tree conflicts.
Did I miss the way to find the tree conflicts?
At the moment I'm having to guess which folder is in conflict.
Barry
Re: Tree conflict - svn status cannot show?
Posted by Tyler Roscoe <ty...@cryptio.net>.
On Fri, Feb 26, 2010 at 12:05:52AM +0000, Barry Scott wrote:
> svn st -q
>
> and the output is blank.
You might want to take a look at what the -q option does...
tyler
Re: Tree conflict - svn status cannot show?
Posted by Barry Scott <ba...@barrys-emacs.org>.
On 26 Feb 2010, at 13:01, Stefan Sperling wrote:
> On Fri, Feb 26, 2010 at 12:05:52AM +0000, Barry Scott wrote:
> j
>> On 25 Feb 2010, at 23:18, Stefan Sperling wrote:
>>
>>> On Thu, Feb 25, 2010 at 10:30:18PM +0000, Barry Scott wrote:
>>>> I starting to see failures to commit because of tree conflicts.
>>>>
>>>> svn status does not seem to show tree conflicts.
>>>
>>> It sure does. See examples here:
>>> http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html
>>
>> We notice tree conflict after folder moves. Not seen one for a file move yet.
>> This example only about file issues not folder issues.
>>
>>>
>>>> Did I miss the way to find the tree conflicts?
>>>
>>> Not sure. What commands are you running and what output are you seeing?
>>
>> svn st -q
>>
>> and the output is blank.
>>
>> (I ran svn st -q after pysvn workbench failed to show anything problems.)
>
> What version of svn? Below 1.6.3?
Some at 1.6.5 others at 1.5.4.
> If so, this could be http://subversion.tigris.org/issues/show_bug.cgi?id=3382
> which was fixed in 1.6.3.
ok. I'll make sure everybody is updated to this version of better.
>
> If this is not the problem, please try to come up with a script that
> others can use to reproduce the problem, starting from an empty
> repository.
Will do if I see this again.
Barry
Re: Tree conflict - svn status cannot show?
Posted by Stefan Sperling <st...@elego.de>.
On Fri, Feb 26, 2010 at 12:05:52AM +0000, Barry Scott wrote:
j
> On 25 Feb 2010, at 23:18, Stefan Sperling wrote:
>
> > On Thu, Feb 25, 2010 at 10:30:18PM +0000, Barry Scott wrote:
> >> I starting to see failures to commit because of tree conflicts.
> >>
> >> svn status does not seem to show tree conflicts.
> >
> > It sure does. See examples here:
> > http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html
>
> We notice tree conflict after folder moves. Not seen one for a file move yet.
> This example only about file issues not folder issues.
>
> >
> >> Did I miss the way to find the tree conflicts?
> >
> > Not sure. What commands are you running and what output are you seeing?
>
> svn st -q
>
> and the output is blank.
>
> (I ran svn st -q after pysvn workbench failed to show anything problems.)
What version of svn? Below 1.6.3?
If so, this could be http://subversion.tigris.org/issues/show_bug.cgi?id=3382
which was fixed in 1.6.3.
If this is not the problem, please try to come up with a script that
others can use to reproduce the problem, starting from an empty
repository.
Stefan
Re: Tree conflict - svn status cannot show?
Posted by Barry Scott <ba...@barrys-emacs.org>.
On 25 Feb 2010, at 23:18, Stefan Sperling wrote:
> On Thu, Feb 25, 2010 at 10:30:18PM +0000, Barry Scott wrote:
>> I starting to see failures to commit because of tree conflicts.
>>
>> svn status does not seem to show tree conflicts.
>
> It sure does. See examples here:
> http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html
We notice tree conflict after folder moves. Not seen one for a file move yet.
This example only about file issues not folder issues.
>
>> Did I miss the way to find the tree conflicts?
>
> Not sure. What commands are you running and what output are you seeing?
svn st -q
and the output is blank.
(I ran svn st -q after pysvn workbench failed to show anything problems.)
I guess I'm going to have to create a test script for this given you expect this to work.
Barry
Re: Tree conflict - svn status cannot show?
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Feb 25, 2010 at 10:30:18PM +0000, Barry Scott wrote:
> I starting to see failures to commit because of tree conflicts.
>
> svn status does not seem to show tree conflicts.
It sure does. See examples here:
http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html
> Did I miss the way to find the tree conflicts?
Not sure. What commands are you running and what output are you seeing?
Stefan