upstream/mercurial-mirror Files · tests/svn/svndump-startrev.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:

r7475:90d8dfb4 default


                r22284:72b37865

default

Download file

             svndump-startrev.sh
        
                    44 lines
            
             | 732 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / svn / svndump-startrev.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      #

      # Use this script to generate startrev.svndump

      #

      mkdir temp

      cd temp

      mkdir project-orig

      cd project-orig

      mkdir trunk

      mkdir branches

      mkdir tags

      cd ..

      svnadmin create svn-repo

      svnurl=file://`pwd`/svn-repo

      svn import project-orig $svnurl -m "init projA"

      svn co $svnurl project

      cd project

      echo a > trunk/a

      echo b > trunk/b

      svn add trunk/a trunk/b

      svn ci -m createab

      svn rm trunk/b

      svn ci -m removeb

      svn up

      echo a >> trunk/a

      svn ci -m changeaa

      # Branch

      svn up

      svn copy trunk branches/branch1

      echo a >> branches/branch1/a

      svn ci -m "branch, changeaaa"

      echo a >> branches/branch1/a

      echo c > branches/branch1/c

      svn add branches/branch1/c

      svn ci -m "addc,changeaaaa"

      svn up

      cd ..

      svnadmin dump svn-repo > ../startrev.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
				#
				# Use this script to generate startrev.svndump
				#

				mkdir temp
				cd temp

				mkdir project-orig
				cd project-orig
				mkdir trunk
				mkdir branches
				mkdir tags
				cd ..

				svnadmin create svn-repo
				svnurl=file://`pwd`/svn-repo
				svn import project-orig $svnurl -m "init projA"

				svn co $svnurl project
				cd project
				echo a > trunk/a
				echo b > trunk/b
				svn add trunk/a trunk/b
				svn ci -m createab
				svn rm trunk/b
				svn ci -m removeb
				svn up
				echo a >> trunk/a
				svn ci -m changeaa

				# Branch
				svn up
				svn copy trunk branches/branch1
				echo a >> branches/branch1/a
				svn ci -m "branch, changeaaa"

				echo a >> branches/branch1/a
				echo c > branches/branch1/c
				svn add branches/branch1/c
				svn ci -m "addc,changeaaaa"
				svn up
				cd ..

				svnadmin dump svn-repo > ../startrev.svndump