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

merge-tools: when calling external merge tool, describe the resolve inputs...

merge-tools: when calling external merge tool, describe the resolve inputs It is a common complaint that a user will be running some operation (histedit, rebase, evolve, etc.), get into a merge-conflict situation, and not understand what they are seeing - it is possible that the merge tool is configured to display the hash, but it's difficult for most merge tools to display a good snippet of the description. In the worst case, configuring this template will lead to output that is immediately covered by a terminal application, maybe the user can hit ctrl-z to see it. In the common case, the output will be in a terminal window and a GUI program will start, and it should be possible to view both the terminal and the GUI program at the same time. Differential Revision: https://phab.mercurial-scm.org/D5094

timeless - - Load All Authors

File last commit:

r27498:f3398f1f default


                r40512:86dfae98

default

Download file

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

      #!/bin/sh

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

      #

      # 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'

      # 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'

      # 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é'

      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

				#!/bin/sh
				# -- coding: utf-8 --
				#
				# 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'

				# 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'

				# 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é'
				cd ..

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