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

import: show the warning message for failure of merging...

import: show the warning message for failure of merging Before this patch, no message is shown for failure of merging at "hg import". In such case, merging patch is imported as a normal revision silently, and it may confuse users. For simplicity, this patch recommends just using "--exact", even though importing the merging patch itself is possible without it if: - the hash of the 1st parent in the patch is equal to one of the patch imported just before (or the parent of the working directory, for the 1st patch of the series), and - the hash of the 2nd parent in the patch is known in the local repository

Patrick Mezard - - Load All Authors

File last commit:

r11194:67985364 stable


                r22303:0c838e74

stable

Download file

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

      #!/bin/sh

      #

      # Use this script to generate branches.svndump

      #

      mkdir temp

      cd temp

      mkdir project-orig

      cd project-orig

      mkdir trunk

      mkdir branches

      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

      echo c > trunk/c

      mkdir trunk/dir

      echo e > trunk/dir/e

      # Add a file within branches, used to confuse branch detection

      echo d > branches/notinbranch

      svn add trunk/a trunk/b trunk/c trunk/dir branches/notinbranch

      svn ci -m hello

      svn up

      # Branch to old

      svn copy trunk branches/old

      svn rm branches/old/c

      svn rm branches/old/dir

      svn ci -m "branch trunk, remove c and dir"

      svn up

      # Update trunk

      echo a >> trunk/a

      svn ci -m "change a"

      # Update old branch

      echo b >> branches/old/b

      svn ci -m "change b"

      # Create a cross-branch revision

      svn move trunk/b branches/old/c

      echo c >> branches/old/c

      svn ci -m "move and update c"

      # Update old branch again

      echo b >> branches/old/b

      svn ci -m "change b again"

      # Move back and forth between branch of similar names

      # This used to generate fake copy records

      svn up

      svn move branches/old branches/old2

      svn ci -m "move to old2"

      svn move branches/old2 branches/old

      svn ci -m "move back to old"

      # Update trunk again

      echo a > trunk/a

      svn ci -m "last change to a"

      # Branch again from a converted revision

      svn copy -r 1 $svnurl/trunk branches/old3

      svn ci -m "branch trunk@1 into old3"

      cd ..

      svnadmin dump svn-repo > ../branches.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 branches.svndump
				#

				mkdir temp
				cd temp

				mkdir project-orig
				cd project-orig
				mkdir trunk
				mkdir branches
				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
				echo c > trunk/c
				mkdir trunk/dir
				echo e > trunk/dir/e
				# Add a file within branches, used to confuse branch detection
				echo d > branches/notinbranch
				svn add trunk/a trunk/b trunk/c trunk/dir branches/notinbranch
				svn ci -m hello
				svn up

				# Branch to old
				svn copy trunk branches/old
				svn rm branches/old/c
				svn rm branches/old/dir
				svn ci -m "branch trunk, remove c and dir"
				svn up

				# Update trunk
				echo a >> trunk/a
				svn ci -m "change a"

				# Update old branch
				echo b >> branches/old/b
				svn ci -m "change b"

				# Create a cross-branch revision
				svn move trunk/b branches/old/c
				echo c >> branches/old/c
				svn ci -m "move and update c"

				# Update old branch again
				echo b >> branches/old/b
				svn ci -m "change b again"

				# Move back and forth between branch of similar names
				# This used to generate fake copy records
				svn up
				svn move branches/old branches/old2
				svn ci -m "move to old2"
				svn move branches/old2 branches/old
				svn ci -m "move back to old"

				# Update trunk again
				echo a > trunk/a
				svn ci -m "last change to a"

				# Branch again from a converted revision
				svn copy -r 1 $svnurl/trunk branches/old3
				svn ci -m "branch trunk@1 into old3"
				cd ..

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