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

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Patrick Mezard - - Load All Authors

File last commit:

r11194:67985364 stable


                r41198:0101a35d

default

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