Databases
StackOverflow2013
Postsdbo
POOdd SVN reverse merge error messages
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POOdd SVN reverse merge error messages
    primarykey
    data
    text
    <p>Trying to reverse merge to recover 1 specific file. I believe I understand how it's supposed to work, but getting odd errors.</p> <p>I've reread the svn book, Google and stack, etc.</p> <p>The problem:</p> <p>I want to specify 1 specific file to restore.</p> <p>SVN doesn't like the local file reference because the file doesn't exist, but online examples seem to use the local file name.</p> <p>It also doesn't like the full http path, because it doesn't exist in the repository. I know it doesn't exist now, but it was there. Even using @peg syntax still gives an error.</p> <p>Example:</p> <ul> <li>In revision <strong>100</strong> I remove a bunch of files, so <strong>r99</strong> was the last point in time it existed.</li> <li>We're now at revision <strong>150</strong> and I want just one file back.</li> <li>Let's say the file is called <strong>.myFile</strong> (with a leading dot, don't think that matters)</li> <li>Project URL and "working directory" is <a href="http://server/repo/Project/trunk" rel="nofollow">http://server/repo/Project/trunk</a></li> <li>The file's URL would have been <a href="http://server/repo/Project/trunk/.myFile" rel="nofollow">http://server/repo/Project/trunk/.myFile</a></li> <li>Assume I'm in the equivalent filesystem directory, with no pending updates or commits, in other words <strong>svn status --show-updates .</strong> shows I'm up to date.</li> <li>And I'm able to do svn cat <a href="http://server/repo/Project/trunk/.myFile@99" rel="nofollow">http://server/repo/Project/trunk/.myFile@99</a></li> </ul> <p>Failed Attempts:</p> <pre><code>svn merge -c -100 .myFile Error: .myFile not under version control svn merge -c -100 http://server/repo/Project/trunk/.myFile Error: svn: '/repo/!svn/bc/120/Project/.myFile' path not found Note that rev 120 is between the delete (r100) and now (r150) svn merge -c -100 http://server/repo/Project/trunk/.myFile@99 Error: svn: File not found: revision 100, path '/Project/trunk/.myFile' svn merge -c -100 . .myFile Don't recall specific error. svn merge -c -100 . http://server/repo/Project/trunk/.myFile@99 Error: svn: Cannot specify a revision range with two URLs </code></pre> <p>... and various other combinations....</p> <p>I'm really stumped. I believe I understand about the reverse merge, and about why @pegs are sometimes needed, but this particular combination is quite vexing.</p> <p>I have workarounds: I could restore all the files then cleanup. Or just copy and paste an older version in, I could do that with the svn cat command.</p> <p>But I'd like to understand the "correct" way.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USMark Bennett
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POOdd SVN reverse merge error messages
      1. USMark Bennett
      1. VTFavorite
    2. VO
      singulars
      1. POOdd SVN reverse merge error messages
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POOdd SVN reverse merge error messages
      1. UScentic
      1. VTFavorite
    1. This table or related slice is empty.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload