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

r11194:67985364 stable


                r37805:92213f67

default

Download file

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

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      #!/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

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      mkdir trunk/dir

      echo e > trunk/dir/e

        Patrick Mezard
    
Rewrite svn tests using svndump...

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

      echo d > branches/notinbranch

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

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

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      svn ci -m hello

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      svn up

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      # Branch to old

      svn copy trunk branches/old

      svn rm branches/old/c

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      svn rm branches/old/dir

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

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      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

Patrick Mezard Rewrite svn tests using svndump...	r7475	#!/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
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	mkdir trunk/dir
		echo e > trunk/dir/e
Patrick Mezard Rewrite svn tests using svndump...	r7475	# Add a file within branches, used to confuse branch detection
		echo d > branches/notinbranch
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	svn add trunk/a trunk/b trunk/c trunk/dir branches/notinbranch
Patrick Mezard Rewrite svn tests using svndump...	r7475	svn ci -m hello
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	svn up
Patrick Mezard Rewrite svn tests using svndump...	r7475
		# Branch to old
		svn copy trunk branches/old
		svn rm branches/old/c
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	svn rm branches/old/dir
		svn ci -m "branch trunk, remove c and dir"
Patrick Mezard Rewrite svn tests using svndump...	r7475	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