You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by anatoly techtonik <te...@gmail.com> on 2010/03/15 14:57:27 UTC
bug: missing files in WC after tree conflict
Please, confirm this bug to track it in bug tracker. I've just locked
my WC located on samba share into state inconsistent with repository.
The file mailer_stable.conf present in repository has gone from WC and
doesn't come back. The command line log is below.
Please, CC.
J:\eqtools>svn up
C subversion\mailer_stable.conf
D htdocs
...
Updated to revision 12640.
Summary of conflicts:
Tree conflicts: 1
J:\eqtools\subversion>svn st
A + C mailer_stable.conf
> local add, incoming add upon update
J:\eqtools\subversion>move mailer_stable.conf mailer_stable.conf_
1 file(s) moved.
J:\eqtools\subversion>svn up
At revision 12640.
J:\eqtools\subversion>svn revert . -R
Reverted 'mailer_stable.conf'
J:\eqtools\subversion>dir
Volume in drive J is public_html
Volume Serial Number is 16FE-3540
Directory of J:\eqtools\subversion
02/27/2010 04:05 AM <DIR> .
02/27/2010 04:06 AM <DIR> ..
01/23/2010 12:11 AM 12,904 mailer.conf
02/18/2010 11:08 AM <DIR> hooks
02/12/2010 11:09 AM 12,982 mailer_stable.conf_
2 File(s) 25,886 bytes
3 Dir(s) 141,967,360 bytes free
J:\eqtools\subversion>svn up
At revision 12640.
J:\eqtools>svn up
At revision 12640.
J:\eqtools>svn st
? subversion\mailer_stable.conf_
J:\eqtools\subversion>svn st -v
12640 12342 useredit .
? mailer_stable.conf_
12640 12329 useredit hooks
12640 12329 useredit hooks\eqrepo-policy.py
12640 12239 useredit hooks\mailer.py
12640 12310 useredit hooks\svnhook
12640 12310 useredit hooks\svnhook\svnlook.py
12640 12240 useredit hooks\svnhook\__init__.py
12640 12311 useredit hooks\post-commit
12640 12329 useredit hooks\pre-commit
12640 12311 useredit hooks\eq.py
12640 11341 useredit mailer.conf
J:\eqtools\subversion>svn ls -v
12342 useredit Feb 19 00:04 ./
12329 useredit Feb 18 11:10 hooks/
11341 useredit 12904 Nov 19 01:29 mailer.conf
12342 useredit 12982 Feb 19 00:04 mailer_stable.conf
J:\eqtools>svn --version
svn, version 1.6.6 (r40053)
compiled Oct 26 2009, 20:14:36
...
--
anatoly t.
Re: bug: missing files in WC after tree conflict
Posted by Stephen Butler <sb...@elego.de>.
On Mar 15, 2010, at 15:57 , anatoly techtonik wrote:
> Please, confirm this bug to track it in bug tracker. I've just locked
> my WC located on samba share into state inconsistent with repository.
>
> The file mailer_stable.conf present in repository has gone from WC and
> doesn't come back. The command line log is below.
Hi Anatoly,
this looks like issue #3569. I've added a comment there explaining
the sequence of actions you describe.
http://subversion.tigris.org/issues/show_bug.cgi?id=3569
Regards,
Steve
>
> Please, CC.
>
>
>
> J:\eqtools>svn up
> C subversion\mailer_stable.conf
> D htdocs
> ...
> Updated to revision 12640.
> Summary of conflicts:
> Tree conflicts: 1
>
> J:\eqtools\subversion>svn st
> A + C mailer_stable.conf
> > local add, incoming add upon update
>
> J:\eqtools\subversion>move mailer_stable.conf mailer_stable.conf_
> 1 file(s) moved.
>
> J:\eqtools\subversion>svn up
> At revision 12640.
>
> J:\eqtools\subversion>svn revert . -R
> Reverted 'mailer_stable.conf'
>
> J:\eqtools\subversion>dir
> Volume in drive J is public_html
> Volume Serial Number is 16FE-3540
>
> Directory of J:\eqtools\subversion
>
> 02/27/2010 04:05 AM <DIR> .
> 02/27/2010 04:06 AM <DIR> ..
> 01/23/2010 12:11 AM 12,904 mailer.conf
> 02/18/2010 11:08 AM <DIR> hooks
> 02/12/2010 11:09 AM 12,982 mailer_stable.conf_
> 2 File(s) 25,886 bytes
> 3 Dir(s) 141,967,360 bytes free
>
> J:\eqtools\subversion>svn up
> At revision 12640.
>
> J:\eqtools>svn up
> At revision 12640.
>
> J:\eqtools>svn st
> ? subversion\mailer_stable.conf_
>
> J:\eqtools\subversion>svn st -v
> 12640 12342 useredit .
> ? mailer_stable.conf_
> 12640 12329 useredit hooks
> 12640 12329 useredit hooks\eqrepo-policy.py
> 12640 12239 useredit hooks\mailer.py
> 12640 12310 useredit hooks\svnhook
> 12640 12310 useredit hooks\svnhook\svnlook.py
> 12640 12240 useredit hooks\svnhook\__init__.py
> 12640 12311 useredit hooks\post-commit
> 12640 12329 useredit hooks\pre-commit
> 12640 12311 useredit hooks\eq.py
> 12640 11341 useredit mailer.conf
>
> J:\eqtools\subversion>svn ls -v
> 12342 useredit Feb 19 00:04 ./
> 12329 useredit Feb 18 11:10 hooks/
> 11341 useredit 12904 Nov 19 01:29 mailer.conf
> 12342 useredit 12982 Feb 19 00:04 mailer_stable.conf
>
> J:\eqtools>svn --version
> svn, version 1.6.6 (r40053)
> compiled Oct 26 2009, 20:14:36
> ...
>
> --
> anatoly t.
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194