upstream/mercurial-mirror Files · tests/test-issue1802.t

histedit: correct the number of added revisions in online help...

histedit: correct the number of added revisions in online help In the context of help document on which this patch focuses, the example repository, which is source of cloning, should be already histedit-ed, and contain only 3 revisions (rev # 0 to 2). So, not 3, but 4 revisions should be added to the destination repository of cloning, if it contains 7 revisions (rev # 0 to 6). This patch also adds modifier "histedit-ed" to "example repository", to make context clear.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r18323:7648b87e

stable

Download file

             test-issue1802.t
        
                    73 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1802.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ "$TESTDIR/hghave" execbit || exit 80

      Create extension that can disable exec checks:

        $ cat > noexec.py <<EOF

        > from mercurial import extensions, util

        > def setflags(orig, f, l, x):

        >     pass

        > def checkexec(orig, path):

        >     return False

        > def extsetup(ui):

        >     extensions.wrapfunction(util, 'setflags', setflags)

        >     extensions.wrapfunction(util, 'checkexec', checkexec)

        > EOF

        $ hg init unix-repo

        $ cd unix-repo

        $ touch a

        $ hg add a

        $ hg commit -m 'unix: add a'

        $ hg clone . ../win-repo

        updating to branch default

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

        $ chmod +x a

        $ hg commit -m 'unix: chmod a'

        $ hg manifest -v

        755 * a

        $ cd ../win-repo

        $ touch b

        $ hg add b

        $ hg commit -m 'win: add b'

        $ hg manifest -v

        644   a

        644   b

        $ hg pull

        pulling from $TESTTMP/unix-repo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg manifest -v -r tip

        755 * a

      Simulate a Windows merge:

        $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug

          searching for copies back to rev 1

          unmatched files in local:

           b

        resolving manifests

         overwrite: False, partial: False

         ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39

         a: update permissions -> e

        updating: a 1/1 files (100.00%)

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

        (branch merge, don't forget to commit)

      Simulate a Windows commit:

        $ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

        $ hg manifest -v

        755 * a

        644   b

        $ cd ..

	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/hghave" execbit \|\| exit 80

				Create extension that can disable exec checks:

				$ cat > noexec.py <<EOF
				> from mercurial import extensions, util
				> def setflags(orig, f, l, x):
				> pass
				> def checkexec(orig, path):
				> return False
				> def extsetup(ui):
				> extensions.wrapfunction(util, 'setflags', setflags)
				> extensions.wrapfunction(util, 'checkexec', checkexec)
				> EOF

				$ hg init unix-repo
				$ cd unix-repo
				$ touch a
				$ hg add a
				$ hg commit -m 'unix: add a'
				$ hg clone . ../win-repo
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ chmod +x a
				$ hg commit -m 'unix: chmod a'
				$ hg manifest -v
				755 * a

				$ cd ../win-repo

				$ touch b
				$ hg add b
				$ hg commit -m 'win: add b'

				$ hg manifest -v
				644 a
				644 b

				$ hg pull
				pulling from $TESTTMP/unix-repo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)

				$ hg manifest -v -r tip
				755 * a

				Simulate a Windows merge:

				$ hg --config extensions.n=$TESTTMP/noexec.py merge --debug
				searching for copies back to rev 1
				unmatched files in local:
				b
				resolving manifests
				overwrite: False, partial: False
				ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
				a: update permissions -> e
				updating: a 1/1 files (100.00%)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Simulate a Windows commit:

				$ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'

				$ hg manifest -v
				755 * a
				644 b

				$ cd ..