http://permalink.gmane.org/gmane.comp.version-control.superversion.general hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.version-control.superversion.general/140 <pre>Regarding svn, version 1.6.13 (r1002816): I have a trunk branch, we'll call it trunk, from which I copied to make a development branch, we'll call it dev. $ svn cp $SVN_ROOT/branches/trunk $SVN_ROOT/branches/dev Recently, I rebased against trunk. $ svn merge $SVN_ROOT/branches/trunk $ svn ci -m "Rebase with trunk." Now ... somehow I've got things in a state in which files which were added by someone else to trunk are showing up on my dev branch as '?'. $ svn st ? sub/dir/file.h If I check out a new copy of my dev branch, those files are indeed not on the branch. I'm not sure how I got to this state. ~shrug~ Fine. But attempting to add the file gives me. $ svn add sub/dir/file.h $ svn st A sub/dir/file.h $ svn ci svn: Commit failed (details follow): svn: File '$SVN_ROOT/branches/dev/sub/dir/file.h' already exists So... it's unknown but it already exists? Any help on how to get this local copy of the file already on trunk to be known in my dev branch would be greatly appreciated. --------------</pre> Damien Kick 2011-04-25T21:38:51 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.version-control.superversion.general