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

subrepo: fix for merge inconsistencies...

subrepo: fix for merge inconsistencies Merging ancestors with children is allowed if they are on different named branches. This did not work for subrepo merges before. To fix this inconsistency, the mergefunc() will now use the simple update path only if both versions are on the same named branch. If not, they get merged into a new changeset, just as if you did the merge from the subrepo's root directly.

Patrick Mezard - - Load All Authors

File last commit:

r7475:90d8dfb4 default


                r16196:8ae7626d

stable

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