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

rebase: introduce support for automatically rebasing orphan changes...

rebase: introduce support for automatically rebasing orphan changes _destautorebase(SRC) is based on the _destrestack(SRC) revset from fbamend. The supporting _possibledestination function is extracted from evolve, with minor cleanups. We've considered some alternatives here: * This change, but with --auto as the flag name. We're hedging our bets on this a little in this change so that if this ends up being the wrong direction we haven't burned the valauble --auto name on rebase. * --destination auto: I've got reservations about the discoverability of this, and we don't currently have a good story for a revset alias of sorts that changes behavior depending on the context in which it's used. * A "rebase presets" feature, where we could use the currently-an-error positional argument space for the rebase command to define presets, so that users could define a 'linearize' preset that specifies --revision='orphan()-obsolete()' and --dest=_destautoorphanrebase(SRC). Personally, I find the third option somewhat appealing, but am hesitant to "spend" the functionality space of positional arguments to the rebase command. We should revisit the way we expose this functionality sometime in the 4.7 cycle once we've had a chance to vet the implementation of the functionality. Differential Revision: https://phab.mercurial-scm.org/D2668

Patrick Mezard - - Load All Authors

File last commit:

r11124:55abde5c stable


                r37805:92213f67

default

Download file

             svndump-move.sh
        
                    82 lines
            
             | 2.3 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / svn / svndump-move.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      #

      # Use this script to generate move.svndump

      #

      mkdir temp

      cd temp

      mkdir project-orig

      cd project-orig

      mkdir trunk

      echo a > trunk/a

      mkdir trunk/d1

      mkdir trunk/d2

      echo b > trunk/d1/b

      echo c > trunk/d1/c

      echo d > trunk/d2/d

      cd ..

      svnadmin create svn-repo

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

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

      svn co $svnurl project

      cd project

      # Build a module renaming chain which used to confuse the converter.

      # Update svn repository

      echo a >> trunk/a

      echo c >> trunk/d1/c

      svn ci -m commitbeforemove

      svn mv $svnurl/trunk $svnurl/subproject -m movedtrunk

      svn up

      mkdir subproject/trunk

      svn add subproject/trunk

      svn ci -m createtrunk

      mkdir subproject/branches

      svn add subproject/branches

      svn ci -m createbranches

      svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1

      svn mv $svnurl/subproject/d2 $svnurl/subproject/trunk/d2 -m moved2

      svn up

      echo b >> subproject/trunk/d1/b

      svn rm subproject/trunk/d2

      svn ci -m "changeb and rm d2"

      svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again

      if svn help copy | grep 'SRC\[@REV\]' > /dev/null 2>&1; then

          # SVN >= 1.5 replaced the -r REV syntax with @REV

          # Copy a file from a past revision

          svn copy $svnurl/subproject/trunk/d2/d@7 $svnurl/subproject/trunk -m copyfilefrompast

          # Copy a directory from a past revision

          svn copy $svnurl/subproject/trunk/d2@7 $svnurl/subproject/trunk -m copydirfrompast

      else

          # Copy a file from a past revision

          svn copy -r 7 $svnurl/subproject/trunk/d2/d $svnurl/subproject/trunk -m copyfilefrompast

          # Copy a directory from a past revision

          svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast

      fi

      # Copy a directory while removing a subdirectory

      svn up

      mkdir -p subproject/trunk/d3/d31

      echo e > subproject/trunk/d3/d31/e

      echo f > subproject/trunk/d3/f

      svn add subproject/trunk/d3

      svn ci -m "add d3"

      svn copy subproject/trunk/d3 subproject/trunk/d4

      svn rm subproject/trunk/d3/d31

      svn ci -m "copy dir and remove subdir"

      # Test directory moves

      svn up

      mkdir -p subproject/trunk/d4old

      echo g > subproject/trunk/d4old/g

      svn add subproject/trunk/d4old

      svn ci -m "add d4old"

      svn mv subproject/trunk/d4old subproject/trunk/d4new

      svn ci -m "rename d4old into d4new"

      cd ..

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

				mkdir temp
				cd temp

				mkdir project-orig
				cd project-orig
				mkdir trunk
				echo a > trunk/a
				mkdir trunk/d1
				mkdir trunk/d2
				echo b > trunk/d1/b
				echo c > trunk/d1/c
				echo d > trunk/d2/d
				cd ..

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

				svn co $svnurl project
				cd project
				# Build a module renaming chain which used to confuse the converter.
				# Update svn repository
				echo a >> trunk/a
				echo c >> trunk/d1/c
				svn ci -m commitbeforemove
				svn mv $svnurl/trunk $svnurl/subproject -m movedtrunk
				svn up
				mkdir subproject/trunk
				svn add subproject/trunk
				svn ci -m createtrunk
				mkdir subproject/branches
				svn add subproject/branches
				svn ci -m createbranches
				svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1
				svn mv $svnurl/subproject/d2 $svnurl/subproject/trunk/d2 -m moved2
				svn up
				echo b >> subproject/trunk/d1/b

				svn rm subproject/trunk/d2
				svn ci -m "changeb and rm d2"
				svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again

				if svn help copy \| grep 'SRC\[@REV\]' > /dev/null 2>&1; then
				# SVN >= 1.5 replaced the -r REV syntax with @REV
				# Copy a file from a past revision
				svn copy $svnurl/subproject/trunk/d2/d@7 $svnurl/subproject/trunk -m copyfilefrompast
				# Copy a directory from a past revision
				svn copy $svnurl/subproject/trunk/d2@7 $svnurl/subproject/trunk -m copydirfrompast
				else
				# Copy a file from a past revision
				svn copy -r 7 $svnurl/subproject/trunk/d2/d $svnurl/subproject/trunk -m copyfilefrompast
				# Copy a directory from a past revision
				svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast
				fi

				# Copy a directory while removing a subdirectory
				svn up
				mkdir -p subproject/trunk/d3/d31
				echo e > subproject/trunk/d3/d31/e
				echo f > subproject/trunk/d3/f
				svn add subproject/trunk/d3
				svn ci -m "add d3"
				svn copy subproject/trunk/d3 subproject/trunk/d4
				svn rm subproject/trunk/d3/d31
				svn ci -m "copy dir and remove subdir"

				# Test directory moves
				svn up
				mkdir -p subproject/trunk/d4old
				echo g > subproject/trunk/d4old/g
				svn add subproject/trunk/d4old
				svn ci -m "add d4old"
				svn mv subproject/trunk/d4old subproject/trunk/d4new
				svn ci -m "rename d4old into d4new"

				cd ..

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