upstream/mercurial-mirror Files · tests/test-subrepo-deep-nested-change.t

push: don't treat bookmark as a found change...

push: don't treat bookmark as a found change Treating bookmarks as a found change results in confusing documentation or output and is less useful for scripting.

Mads Kiilerich - - Load All Authors

File last commit:

r15447:9910f60a default


                r16038:dad96e75

stable

Download file

             test-subrepo-deep-nested-change.t
        
                    102 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-deep-nested-change.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
      Preparing the subrepository 'sub2'

        $ hg init sub2

        $ echo sub2 > sub2/sub2

        $ hg add -R sub2

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        adding sub2/sub2 (glob)

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        $ hg commit -R sub2 -m "sub2 import"

      Preparing the 'sub1' repo which depends on the subrepo 'sub2'

        $ hg init sub1

        $ echo sub1 > sub1/sub1

        $ echo "sub2 = ../sub2" > sub1/.hgsub

        Nicolas Dumazet
    
tests: use regular expression instead of sed in test-subrepo-deep-nested-change

              r12107
            
        $ hg clone sub2 sub1/sub2

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg add -R sub1

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        adding sub1/.hgsub (glob)

        adding sub1/sub1 (glob)

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        $ hg commit -R sub1 -m "sub1 import"

        committing subrepository sub2

      Preparing the 'main' repo which depends on the subrepo 'sub1'

        $ hg init main

        $ echo main > main/main

        $ echo "sub1 = ../sub1" > main/.hgsub

        Nicolas Dumazet
    
tests: use regular expression instead of sed in test-subrepo-deep-nested-change

              r12107
            
        $ hg clone sub1 main/sub1

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        updating to branch default

        Martin Geisler
    
subrepo: create subrepos using clone instead of pull...

              r14281
            
        cloning subrepo sub2 from $TESTTMP/sub2

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg add -R main

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        adding main/.hgsub (glob)

        adding main/main (glob)

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        $ hg commit -R main -m "main import"

        committing subrepository sub1

      Cleaning both repositories, just as a clone -U

        $ hg up -C -R sub2 null

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg up -C -R sub1 null

        0 files updated, 0 files merged, 3 files removed, 0 files unresolved

        $ hg up -C -R main null

        0 files updated, 0 files merged, 3 files removed, 0 files unresolved

        $ rm -rf main/sub1

        $ rm -rf sub1/sub2

      Clone main

        Nicolas Dumazet
    
tests: use regular expression instead of sed in test-subrepo-deep-nested-change

              r12107
            
        $ hg clone main cloned

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        updating to branch default

        Martin Geisler
    
subrepo: create subrepos using clone instead of pull...

              r14281
            
        cloning subrepo sub1 from $TESTTMP/sub1

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

      Checking cloned repo ids

        $ printf "cloned " ; hg id -R cloned

        cloned 7f491f53a367 tip

        $ printf "cloned/sub1 " ; hg id -R cloned/sub1

        cloned/sub1 fc3b4ce2696f tip

        $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2

        cloned/sub1/sub2 c57a0840e3ba tip

      debugsub output for main and sub1

        $ hg debugsub -R cloned

        path sub1

         source   ../sub1

         revision fc3b4ce2696f7741438c79207583768f2ce6b0dd

        $ hg debugsub -R cloned/sub1

        path sub2

         source   ../sub2

         revision c57a0840e3badd667ef3c3ef65471609acb2ba3c

      Modifying deeply nested 'sub2'

        $ echo modified > cloned/sub1/sub2/sub2

        Martin Geisler
    
subrepos: abort commit by default if a subrepo is dirty (BC)...

              r15321
            
        $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
        committing subrepository sub1

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        committing subrepository sub1/sub2 (glob)

        Martin Geisler
    
tests: unify test-subrepo-deep-nested-change

              r11913
            
      Checking modified node ids

        $ printf "cloned " ; hg id -R cloned

        cloned ffe6649062fe tip

        $ printf "cloned/sub1 " ; hg id -R cloned/sub1

        cloned/sub1 2ecb03bf44a9 tip

        $ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2

        cloned/sub1/sub2 53dd3430bcaf tip

      debugsub output for main and sub1

        $ hg debugsub -R cloned

        path sub1

         source   ../sub1

         revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9

        $ hg debugsub -R cloned/sub1

        path sub2

         source   ../sub2

         revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487

	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

Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	Preparing the subrepository 'sub2'

		$ hg init sub2
		$ echo sub2 > sub2/sub2
		$ hg add -R sub2
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	adding sub2/sub2 (glob)
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	$ hg commit -R sub2 -m "sub2 import"

		Preparing the 'sub1' repo which depends on the subrepo 'sub2'

		$ hg init sub1
		$ echo sub1 > sub1/sub1
		$ echo "sub2 = ../sub2" > sub1/.hgsub
Nicolas Dumazet tests: use regular expression instead of sed in test-subrepo-deep-nested-change	r12107	$ hg clone sub2 sub1/sub2
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg add -R sub1
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	adding sub1/.hgsub (glob)
		adding sub1/sub1 (glob)
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	$ hg commit -R sub1 -m "sub1 import"
		committing subrepository sub2

		Preparing the 'main' repo which depends on the subrepo 'sub1'

		$ hg init main
		$ echo main > main/main
		$ echo "sub1 = ../sub1" > main/.hgsub
Nicolas Dumazet tests: use regular expression instead of sed in test-subrepo-deep-nested-change	r12107	$ hg clone sub1 main/sub1
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	updating to branch default
Martin Geisler subrepo: create subrepos using clone instead of pull...	r14281	cloning subrepo sub2 from $TESTTMP/sub2
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg add -R main
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	adding main/.hgsub (glob)
		adding main/main (glob)
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	$ hg commit -R main -m "main import"
		committing subrepository sub1

		Cleaning both repositories, just as a clone -U

		$ hg up -C -R sub2 null
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg up -C -R sub1 null
		0 files updated, 0 files merged, 3 files removed, 0 files unresolved
		$ hg up -C -R main null
		0 files updated, 0 files merged, 3 files removed, 0 files unresolved
		$ rm -rf main/sub1
		$ rm -rf sub1/sub2

		Clone main

Nicolas Dumazet tests: use regular expression instead of sed in test-subrepo-deep-nested-change	r12107	$ hg clone main cloned
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	updating to branch default
Martin Geisler subrepo: create subrepos using clone instead of pull...	r14281	cloning subrepo sub1 from $TESTTMP/sub1
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	3 files updated, 0 files merged, 0 files removed, 0 files unresolved

		Checking cloned repo ids

		$ printf "cloned " ; hg id -R cloned
		cloned 7f491f53a367 tip
		$ printf "cloned/sub1 " ; hg id -R cloned/sub1
		cloned/sub1 fc3b4ce2696f tip
		$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
		cloned/sub1/sub2 c57a0840e3ba tip

		debugsub output for main and sub1

		$ hg debugsub -R cloned
		path sub1
		source ../sub1
		revision fc3b4ce2696f7741438c79207583768f2ce6b0dd
		$ hg debugsub -R cloned/sub1
		path sub2
		source ../sub2
		revision c57a0840e3badd667ef3c3ef65471609acb2ba3c

		Modifying deeply nested 'sub2'

		$ echo modified > cloned/sub1/sub2/sub2
Martin Geisler subrepos: abort commit by default if a subrepo is dirty (BC)...	r15321	$ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913	committing subrepository sub1
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	committing subrepository sub1/sub2 (glob)
Martin Geisler tests: unify test-subrepo-deep-nested-change	r11913
		Checking modified node ids

		$ printf "cloned " ; hg id -R cloned
		cloned ffe6649062fe tip
		$ printf "cloned/sub1 " ; hg id -R cloned/sub1
		cloned/sub1 2ecb03bf44a9 tip
		$ printf "cloned/sub1/sub2 " ; hg id -R cloned/sub1/sub2
		cloned/sub1/sub2 53dd3430bcaf tip

		debugsub output for main and sub1

		$ hg debugsub -R cloned
		path sub1
		source ../sub1
		revision 2ecb03bf44a94e749e8669481dd9069526ce7cb9
		$ hg debugsub -R cloned/sub1
		path sub2
		source ../sub2
		revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487