subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
Date Thu, 16 Jun 2011 08:13:02 GMT
Wolfgang Röckelein wrote on Thu, Jun 16, 2011 at 08:45:18 +0200:
> Daniel Shahaf wrote:
> > Wolfgang Röckelein wrote on Wed, Jun 15, 2011 at 10:05:16 +0200:
> >> I have two problems when creating a tag from a mixed rev working copy. Both
> >> problems are caused by a rename (copy+delete) from the past inside.
> >>
> >> One case is a directory, here I get the following error, XXXX is the deleted
> >> local directory path:
> >>     Working copy not locked; this is probably a bug, please report
> >> svn: Directory 'XXXX' is missing
> >> Can't find a working copy path
> >> svn: Directory 'XXXX' is missing
> >>
> >> Other case is a file, here I get the following error, XXXX is the deleted file
> >> (relative path), YYYY is the tag path:
> >>     Working copy is not up-to-date
> >> svn: Commit failed (details follow):
> >> svn: File 'XXXX' is out of date
> >> Filesystem has no item
> >> svn: '/svn/mobil/!svn/wrk/4263dc38-ec4c-9042-9505-c5fb37cf8ea7/YYYY/XXXX' path
> >> not found
> >>
> >> Can I do anything to create the tag/copy somehow? Because of the mixed rev
> >> working copy copying from head or a rev is not an option.
> > 
> > svnmucc, or URL-URL copy then checkout the tag and commit changes the
> > usual way.
> 
> URL-URL copy will not work because of the mixed rev working copy. The problem is
> not outstanding commit in the WC but the mixed rev! I can also not see how
> svnmucc would help me here.
> 

2. svnmucc -mm cp $U/trunk $U/tags/foo rm $U/tags/foo/subd cp 42 $U/trunk/foo/subd $U/tags/foo/subd

   Have a look at 'svn log -qv' of a mixed-revision-working-copy tag...
   that's what it does.

1. svn cp ^/trunk ^/tags/foo -m "tagging part 1"
   svn sw ^/tags/foo
   svn rm subd
   svn cp ^/trunk/subd@42 subd
   svn ci -m "Backdate subd, completing the tag"

> Thank you,
>   Wolfgang

Mime
View raw message