upstream/mercurial-mirror Files · tests/svn/svndump-replace.sh

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Patrick Mezard - - Load All Authors

File last commit:

r13052:5fb924ee stable


                r22284:72b37865

default

Download file

             svndump-replace.sh
        
                    81 lines
            
             | 1.5 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / svn / svndump-replace.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      RSVN="`pwd`/rsvn.py"

      export PATH=/bin:/usr/bin

      mkdir temp

      cd temp

      svnadmin create repo

      svn co file://`pwd`/repo wc

      cd wc

      mkdir trunk branches

      cd trunk

      echo a > a

      mkdir d

      echo b > d/b

      ln -s d dlink

      ln -s d dlink2

      ln -s d dlink3

      mkdir d2

      echo a > d2/a

      cd ..

      svn add *

      svn ci -m 'initial'

      # Clobber symlink with file with similar content

      cd trunk

      ls -Alh

      readlink dlink3 > dlink3tmp

      rm dlink3

      mv dlink3tmp dlink3

      svn propdel svn:special dlink3

      svn ci -m 'clobber symlink'

      cd ..

      svn up

      # Clobber files and symlink with directories

      cd ..

      cat > clobber.rsvn <<EOF

      rdelete trunk/a

      rdelete trunk/dlink

      rcopy trunk/d trunk/a

      rcopy trunk/d trunk/dlink

      EOF

      python $RSVN --message=clobber1 --username=evil `pwd`/repo < clobber.rsvn

      # Clobber non-symlink with symlink with same content (kudos openwrt)

      cat > clobber.rsvn <<EOF

      rdelete trunk/dlink3

      rcopy trunk/dlink2 trunk/dlink3

      EOF

      python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn

      # Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2,

      # 'b' is in trunk/d2 and 'c' is in branch/d2

      cd wc/trunk

      echo b > d2/b

      svn add d2/b

      svn ci -m adddb

      cd ..

      svn up

      svn cp trunk branches/branch

      cd branches/branch

      svn rm d2/b

      echo c > d2/c

      svn add d2/c

      cd ../..

      svn ci -m branch

      svn up

      cd ..

      cat > clobber.rsvn <<EOF

      rdelete trunk/d2

      rcopy branches/branch/d2 trunk/d2

      EOF

      python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn

      svn log -v file://`pwd`/repo

      svnadmin dump repo > ../replace.svndump

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#!/bin/sh

				RSVN="`pwd`/rsvn.py"
				export PATH=/bin:/usr/bin
				mkdir temp
				cd temp

				svnadmin create repo
				svn co file://`pwd`/repo wc

				cd wc
				mkdir trunk branches
				cd trunk
				echo a > a
				mkdir d
				echo b > d/b
				ln -s d dlink
				ln -s d dlink2
				ln -s d dlink3
				mkdir d2
				echo a > d2/a
				cd ..
				svn add *
				svn ci -m 'initial'
				# Clobber symlink with file with similar content
				cd trunk
				ls -Alh
				readlink dlink3 > dlink3tmp
				rm dlink3
				mv dlink3tmp dlink3
				svn propdel svn:special dlink3
				svn ci -m 'clobber symlink'
				cd ..
				svn up

				# Clobber files and symlink with directories
				cd ..
				cat > clobber.rsvn <<EOF
				rdelete trunk/a
				rdelete trunk/dlink
				rcopy trunk/d trunk/a
				rcopy trunk/d trunk/dlink
				EOF

				python $RSVN --message=clobber1 --username=evil `pwd`/repo < clobber.rsvn

				# Clobber non-symlink with symlink with same content (kudos openwrt)
				cat > clobber.rsvn <<EOF
				rdelete trunk/dlink3
				rcopy trunk/dlink2 trunk/dlink3
				EOF

				python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn

				# Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2,
				# 'b' is in trunk/d2 and 'c' is in branch/d2
				cd wc/trunk
				echo b > d2/b
				svn add d2/b
				svn ci -m adddb
				cd ..
				svn up
				svn cp trunk branches/branch
				cd branches/branch
				svn rm d2/b
				echo c > d2/c
				svn add d2/c
				cd ../..
				svn ci -m branch
				svn up
				cd ..

				cat > clobber.rsvn <<EOF
				rdelete trunk/d2
				rcopy branches/branch/d2 trunk/d2
				EOF
				python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn

				svn log -v file://`pwd`/repo

				svnadmin dump repo > ../replace.svndump