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

issue1577: fix broken test by assuming less about CVS output....

issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default


                r8081:6c3b8132

default

Download file

             test-conflict.out
        
                    15 lines
            
             | 400 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall merge: allow smarter tool configuration...	r6004	merging a
Alexis S. L. Carvalho change tests to use simplemerge by default	r4365	warning: conflicts during merge.
mpm@selenic.com merge3: fix argument order...	r346	merging a failed!
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Augie Fackler merge: better error messages to lead users to hg update --clean to abandon merges....	r7821	use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	e7fe8eb3e180+0d24b7662d3e+ tip
Matt Mackall merge: allow smarter tool configuration...	r6004	<<<<<<< local
mpm@selenic.com merge3: fix argument order...	r346	something else
		=======
		something
Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge...	r4387	>>>>>>> other
mpm@selenic.com Update test output for status change...	r748	M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig

	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