upstream/mercurial-mirror Files · tests/test-merge2.out

Get addremove to use new walk code....

Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.

mpm@selenic.com - - Load All Authors

File last commit:

r749:7e4843b7 default


                r766:b444a7e0

default

Download file

             test-merge2.out
        
                    47 lines
            
             | 844 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge2.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com Pick up tests from previous patch...	r409	+ mkdir t
		+ cd t
		+ hg init
		+ echo This is file a1
		+ hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #0' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ echo This is file b1
		+ hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #1' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ rm b
		+ hg update 0
		+ echo This is file b2
		+ hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #2' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ cd ..
		+ /bin/rm -rf t
		+ mkdir t
		+ cd t
		+ hg init
		+ echo This is file a1
		+ hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #0' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ echo This is file b1
		+ hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #1' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ rm b
		+ hg update 0
		+ echo This is file b2
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -A -m 'commit #2' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ cd ..
		+ /bin/rm -rf t
		+ mkdir t
		+ cd t
		+ hg init
		+ echo This is file a1
		+ hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #0' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ echo This is file b1
		+ hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #1' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ rm b
		+ hg remove b
		+ hg update 0
		+ echo This is file b2
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -A -m 'commit #2' -d '0 0'
mpm@selenic.com Pick up tests from previous patch...	r409	+ cd ..
		+ /bin/rm -rf t

	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