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

Make tests work on Solaris:...

Make tests work on Solaris: - replacement for mktemp - fall back if shell arithmetic doesn't work - replacement for 'set -x' (which results look different with some shells) - "FOO=bar; export FOO" instead of "export FOO=bar" - don't use 'if ! ...'

Bryan O'Sullivan - - Load All Authors

File last commit:

r767:61ed30e8 default


                r798:c28f9feb

default

Download file

             test-merge5.out
        
                    20 lines
            
             | 422 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	+ mkdir t
		+ cd t
		+ hg init
		+ echo This is file a1
		+ echo This is file b1
		+ hg add a b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -m 'commit #0' -d '0 0'
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	+ echo This is file b22
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit '-mcomment #1' -d '0 0'
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	+ hg update 0
		+ rm b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	+ hg commit -A '-mcomment #2' -d '0 0'
Bryan O'Sullivan Update tests to match new addremove chattiness.	r767	removing b
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	+ yes k
		+ hg update 1
		this update spans a branch affecting the following files:
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	b
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	aborting update spanning branches!
		(use update -m to perform a branch merge)
		+ exit 0

	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