upstream/mercurial-mirror Files · tests/test-simple-update.t

update: show the commit to which we updated in case of multiple heads (BC)...

update: show the commit to which we updated in case of multiple heads (BC) Currently when we have multiple heads on the same branch, update tells us that there some more heads for the current branch but does not tells us the head to which the repository has been updated to. It makes more sense showing the head we updated to and then telling there are some more heads.

Yuya Nishihara - - Load All Authors

File last commit:

r31118:a91c6275 stable


                r32698:1b5c61d3

default

Download file

             test-simple-update.t
        
                    93 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-simple-update.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init test

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ cd test

        $ echo foo>foo

        $ hg addremove

        adding foo

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg clone . ../branch

        updating to branch default

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

        $ cd ../branch

        $ hg co

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

        $ echo bar>>foo

        $ hg commit -m "2"

        $ cd ../test

        $ hg pull ../branch

        pulling from ../branch

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

        $ hg co

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

        $ cat foo

        foo

        bar

        $ hg manifest --debug

        6f4310b00b9a147241b071a60c28a650827fb03d 644   foo

        Idan Kamara
    
update: fix check for no rev when a date is given...

              r13960
            
      update to rev 0 with a date

        $ hg upd -d foo 0

        abort: you can't specify a revision and a date

        [255]

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

        Yuya Nishihara
    
worker: add basic test to ensure child processes are managed well...

              r31117
            
      update with worker processes

      #if no-windows

        $ cat <<EOF > forceworker.py

        > from mercurial import extensions, worker

        > def nocost(orig, ui, costperop, nops):

        >     return worker._numworkers(ui) > 1

        > def uisetup(ui):

        >     extensions.wrapfunction(worker, 'worthwhile', nocost)

        > EOF

        $ hg init worker

        $ cd worker

        $ cat <<EOF >> .hg/hgrc

        > [extensions]

        > forceworker = $TESTTMP/forceworker.py

        > [worker]

        > numcpus = 4

        > EOF

        $ for i in `python $TESTDIR/seq.py 1 100`; do

        >   echo $i > $i

        > done

        $ hg ci -qAm 'add 100 files'

        $ hg update null

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

        Yuya Nishihara
    
worker: flush messages written by child processes before exit...

              r31118
            
        $ hg update -v | grep 100

        getting 100

        Yuya Nishihara
    
worker: add basic test to ensure child processes are managed well...

              r31117
            
        100 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd ..

      #endif

	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: remove redundant mkdir...	r13956	$ hg init test
Adrian Buehlmann combine tests	r12279	$ cd test
		$ echo foo>foo
		$ hg addremove
		adding foo
		$ hg commit -m "1"

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

		$ hg clone . ../branch
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd ../branch
		$ hg co
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo bar>>foo
		$ hg commit -m "2"

		$ cd ../test

		$ hg pull ../branch
		pulling from ../branch
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		(run 'hg update' to get a working copy)

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 2 changesets, 2 total revisions

		$ hg co
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ cat foo
		foo
		bar

		$ hg manifest --debug
		6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

Idan Kamara update: fix check for no rev when a date is given...	r13960	update to rev 0 with a date

		$ hg upd -d foo 0
		abort: you can't specify a revision and a date
		[255]
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..
Yuya Nishihara worker: add basic test to ensure child processes are managed well...	r31117
		update with worker processes

		#if no-windows

		$ cat <<EOF > forceworker.py
		> from mercurial import extensions, worker
		> def nocost(orig, ui, costperop, nops):
		> return worker._numworkers(ui) > 1
		> def uisetup(ui):
		> extensions.wrapfunction(worker, 'worthwhile', nocost)
		> EOF

		$ hg init worker
		$ cd worker
		$ cat <<EOF >> .hg/hgrc
		> [extensions]
		> forceworker = $TESTTMP/forceworker.py
		> [worker]
		> numcpus = 4
		> EOF
		$ for i in `python $TESTDIR/seq.py 1 100`; do
		> echo $i > $i
		> done
		$ hg ci -qAm 'add 100 files'

		$ hg update null
		0 files updated, 0 files merged, 100 files removed, 0 files unresolved
Yuya Nishihara worker: flush messages written by child processes before exit...	r31118	$ hg update -v \| grep 100
		getting 100
Yuya Nishihara worker: add basic test to ensure child processes are managed well...	r31117	100 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ cd ..

		#endif