ansaurus

Question

svn cat after svn del

Answer 1

+3 A:

svn merge -c -<revision where you deleted the file> .

So if the delete occurred during revision 4131, you would:

svn merge -c -4131 .
             ^ the negative on the revision is important

In response to the question edit:

You shouldn't specify the filename. Just do . and your file will be restored. Then svn revert the changes that you don't want back.

Sean Bright 2010-05-20 12:13:35

`svn merge` is the operation of applying some bunch of changesets (diffs) to the particular file. in this case you cannot use the command in the way you displayed.

zerkms 2010-05-20 12:45:14

@zerkms: you are not correct. the command works exactly as typed in the tests i ran before posting my response.

Sean Bright 2010-05-20 12:47:22

@zerkms: http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.basicmerging.undo

Sean Bright 2010-05-20 12:51:21

@Sean: --- Reverse-merging r28 into '.': C file.txtSummary of conflicts: Tree conflicts: 1

zerkms 2010-05-20 13:17:28

and documentation is talking about reverting **changes**. it said about how to **undo changes** of file.

zerkms 2010-05-20 13:18:30

@zerkms: a deletion is a change.

wds 2010-05-20 13:22:03

your most recent comment doesn't make grammatical sense so i am not sure what you are trying to say. regardless, from the documentation that i linked: "One option is to use svn merge to apply revision 808 'in reverse.' (...) This would have the effect of re-adding real.c as a local modification. The file would be scheduled for addition, and after a commit, the file would again exist in HEAD."

Sean Bright 2010-05-20 13:23:58

@wds: i know :-) but documentation is talking about another kind of changes. anyway, as you can see it does not work for me.

zerkms 2010-05-20 13:24:18

I added another answer with demonstration that it doesn't work. you can comment there.

zerkms 2010-05-20 13:27:57

oops, my miss. i had to specify the revision at which file was deleted. sorry guys. everything is good.

zerkms 2010-05-20 13:29:09

anyway, my accepted answer is more correct, due to it keeps the previous history.

zerkms 2010-05-20 13:33:08

@zerkms: rolling back the delete will also keep the previous history. Both answers are correct.

wds 2010-05-20 13:47:21

yeah, i'm not sure why this is still in question.

Sean Bright 2010-05-20 14:02:17

hmmmmmm...... i was totally wrong :-S don't know why i thought that `merge` will not keep logs... `merge` is just a `get diff+apply diff` - how could it track the changes?

zerkms 2010-05-20 14:31:18

Answer 2

+2 A:

You must not restore file with cat.

The proper way of doing this is copy

svn copy http://server/full/path/to/myPreciousFile.txt@4130 .

after that commit current directory. with this solution you will keep the complete history of changings of that file.

zerkms 2010-05-20 12:39:48

Answer 3

A:

As others have suggested, you can do a reverse merge to get your file back. I suspect that your command is failing because you also specified the specific file you want to merge, and that file isn't under source control anymore. I can see two options for how to recover it.

Merge and revert

Reverse merge the whole commit, then revert the files you really did want to delete. Here's the example you gave:

f:\path\to\dev\dir> svn diff -r 4250:4251 --summarize
D      file_one.tyb
D      file_two.tyb
D      myPreciousFile.txt

Do the reverse merge:

f:\path\to\dev\dir> svn merge -c -4251

Then revert the two you really meant to delete:

f:\path\to\dev\dir> svn revert file_one.tyb
f:\path\to\dev\dir> svn revert file_two.tyb

Copy

Use the copy command suggested by zerkms to copy the specific file you want out of the repository history.

svn copy http://server/full/path/to/myPreciousFile.txt@4130 .

Don Kirkby 2010-05-20 19:44:16

ansaurus

tags:

views:

answers:

svn cat after svn del

Merge and revert

Copy

related questions