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

r8887:0332f8b4 default


                r16196:8ae7626d

stable

Download file

             svndump-encoding.sh
        
                    57 lines
            
             | 1.0 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / svn / svndump-encoding.sh
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
convert/svn: remove useless encoding/decoding calls (issue1676)

              r8882
            
      # -*- coding: utf-8 -*-

      #!/bin/sh

      #

      # Use this script to generate encoding.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 e > trunk/é

      mkdir trunk/à

      echo d > trunk/à/é

      svn add trunk/é trunk/à

      svn ci -m hello

      # Copy files and directories

      svn mv trunk/é trunk/è

      svn mv trunk/à trunk/ù

      svn ci -m "copy files"

      # Remove files

      svn rm trunk/è

      svn rm trunk/ù

      svn ci -m 'remove files'

        Patrick Mezard
    
convert/svn: stop returning unicode revision identifiers

              r8886
            
      # Create branches with and from weird names

      svn up

      svn cp trunk branches/branché

      echo a > branches/branché/a

      svn ci -m 'branch to branché'

      svn up

      svn cp branches/branché branches/branchée

      echo a >> branches/branché/a

      svn ci -m 'branch to branchée'

        Patrick Mezard
    
convert/svn: test svn tags encoding

              r8887
            
      # Create tag with weird name

      svn up

      svn cp trunk tags/branché

      svn ci -m 'tag trunk'

      svn cp branches/branchée tags/branchée

      svn ci -m 'tag branché'

        Patrick Mezard
    
convert/svn: remove useless encoding/decoding calls (issue1676)

              r8882
            
      cd ..

      svnadmin dump svn-repo > ../encoding.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

Patrick Mezard convert/svn: remove useless encoding/decoding calls (issue1676)	r8882	# -- coding: utf-8 --
		#!/bin/sh
		#
		# Use this script to generate encoding.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 e > trunk/é
		mkdir trunk/à
		echo d > trunk/à/é
		svn add trunk/é trunk/à
		svn ci -m hello

		# Copy files and directories
		svn mv trunk/é trunk/è
		svn mv trunk/à trunk/ù
		svn ci -m "copy files"

		# Remove files
		svn rm trunk/è
		svn rm trunk/ù
		svn ci -m 'remove files'
Patrick Mezard convert/svn: stop returning unicode revision identifiers	r8886
		# Create branches with and from weird names
		svn up
		svn cp trunk branches/branché
		echo a > branches/branché/a
		svn ci -m 'branch to branché'
		svn up
		svn cp branches/branché branches/branchée
		echo a >> branches/branché/a
		svn ci -m 'branch to branchée'
Patrick Mezard convert/svn: test svn tags encoding	r8887
		# Create tag with weird name
		svn up
		svn cp trunk tags/branché
		svn ci -m 'tag trunk'
		svn cp branches/branchée tags/branchée
		svn ci -m 'tag branché'
Patrick Mezard convert/svn: remove useless encoding/decoding calls (issue1676)	r8882	cd ..

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