Thu Aug 02 17:41:00 UTC 2007

Moving an older version of source to the head

Posted in Rails at 05:41 PM by matt

This article is a minor reminder of what needs to happen in order to make an older version of source code in subversion come back (to be restored) to the head.

mkdir svntest

        vi svntest/afile.rb

add the line version 1 exit

svn add svntest 
        svn ci -m "added version 1"

        vi svntest/afile.rb

add the line

    version 2

exit and then run

svn ci -m "added version 2"

now to merge back version 1 to head

if i try to do

svn merge -rhead:1471 http://svn.domain.com/svntest

then i get

    Skipped missing target: ‘afile.rb’

but if do

cd svntest
        svn merge -rhead:1471 http://svn.domain.com/svntest

i get

    U afile.rb

sweet, lets check it in.

svn ci -m "changed to version 1"

i get

    Sending        svntest/afile.rb
    Transmitting file data .
    Committed revision 3.

    cat afile.rb
    version 1

yay!!

Permalink