upstream/mercurial-mirror Files · tests/test-narrow-copies.t

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Augie Fackler - - Load All Authors

File last commit:

r36096:a2a6e724 default


                r38637:c829749e

default

Download file

             test-narrow-copies.t
        
                    57 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-copies.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . "$TESTDIR/narrow-library.sh"

      create full repo

        $ hg init master

        $ cd master

        $ mkdir inside

        $ echo inside > inside/f1

        $ mkdir outside

        $ echo outside > outside/f2

        $ hg ci -Aqm 'initial'

        $ hg mv outside/f2 inside/f2

        $ hg ci -qm 'move f2 from outside'

        $ echo modified > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master narrow --include inside

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 2 files

        new changesets *:* (glob)

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd narrow

        $ hg co 'desc("move f2")'

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

        $ hg status

        $ hg diff

        $ hg diff --change . --git

        diff --git a/inside/f2 b/inside/f2

        new file mode 100644

        --- /dev/null

        +++ b/inside/f2

        @@ -0,0 +1,1 @@

        +outside

        $ hg log --follow inside/f2 -r tip

        changeset:   2:bcfb756e0ca9

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     modify inside/f2

        changeset:   1:5a016133b2bb

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     move f2 from outside

	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


				$ . "$TESTDIR/narrow-library.sh"

				create full repo

				$ hg init master
				$ cd master

				$ mkdir inside
				$ echo inside > inside/f1
				$ mkdir outside
				$ echo outside > outside/f2
				$ hg ci -Aqm 'initial'

				$ hg mv outside/f2 inside/f2
				$ hg ci -qm 'move f2 from outside'

				$ echo modified > inside/f2
				$ hg ci -qm 'modify inside/f2'

				$ cd ..

				$ hg clone --narrow ssh://user@dummy/master narrow --include inside
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 2 files
				new changesets : (glob)
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd narrow

				$ hg co 'desc("move f2")'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg status
				$ hg diff
				$ hg diff --change . --git
				diff --git a/inside/f2 b/inside/f2
				new file mode 100644
				--- /dev/null
				+++ b/inside/f2
				@@ -0,0 +1,1 @@
				+outside

				$ hg log --follow inside/f2 -r tip
				changeset: 2:bcfb756e0ca9
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: modify inside/f2

				changeset: 1:5a016133b2bb
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: move f2 from outside