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

rebase: fix for hgsubversion...

rebase: fix for hgsubversion 5c25fe7fb1e broke something in the hgsubversion test path, causing it raise an abort (Abort: nothing to merge) during a perfectly good rebase. I tracked it down to this change. It's probably not hgsubversion related. I suspect that using the same `wctx` from before the initial update causes problems with the wctx's cached manifest property. I noticed we also sometimes stick random gunk on the wctx object in other places (like in `copies.py`) so it's probably best to reset it for now. The line I added before was actually useless since we don't pass wctx to the initial `merge.update`, so it defaults to `repo[None]`. So I just removed it. Differential Revision: https://phab.mercurial-scm.org/D1679

Patrick Mezard - - Load All Authors

File last commit:

r7475:90d8dfb4 default


                r35411:83014fa9

default

Download file

             svndump-startrev.sh
        
                    44 lines
            
             | 732 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / svn / svndump-startrev.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      #

      # Use this script to generate startrev.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 a > trunk/a

      echo b > trunk/b

      svn add trunk/a trunk/b

      svn ci -m createab

      svn rm trunk/b

      svn ci -m removeb

      svn up

      echo a >> trunk/a

      svn ci -m changeaa

      # Branch

      svn up

      svn copy trunk branches/branch1

      echo a >> branches/branch1/a

      svn ci -m "branch, changeaaa"

      echo a >> branches/branch1/a

      echo c > branches/branch1/c

      svn add branches/branch1/c

      svn ci -m "addc,changeaaaa"

      svn up

      cd ..

      svnadmin dump svn-repo > ../startrev.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 startrev.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 a > trunk/a
				echo b > trunk/b
				svn add trunk/a trunk/b
				svn ci -m createab
				svn rm trunk/b
				svn ci -m removeb
				svn up
				echo a >> trunk/a
				svn ci -m changeaa

				# Branch
				svn up
				svn copy trunk branches/branch1
				echo a >> branches/branch1/a
				svn ci -m "branch, changeaaa"

				echo a >> branches/branch1/a
				echo c > branches/branch1/c
				svn add branches/branch1/c
				svn ci -m "addc,changeaaaa"
				svn up
				cd ..

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