upstream/mercurial-mirror Files · tests/test-merge-revert2.out

warn about new heads on commit (issue842)

Matt Mackall - - Load All Authors

File last commit:

r6004:5af5f0f9 default


                r6336:4b0c9c67

default

Download file

             test-merge-revert2.out
        
                    41 lines
            
             | 980 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-revert2.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	1:f248da0d4c3e
		0:9eca13a34789
		f248da0d4c3e tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	9eca13a34789
		9eca13a34789+
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	reverting file1
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	9eca13a34789
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	f248da0d4c3e tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall merge: allow smarter tool configuration...	r6004	merging file1
Alexis S. L. Carvalho change tests to use simplemerge by default	r4365	warning: conflicts during merge.
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	merging file1 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
		There are unresolved merges with locally modified files.
Thomas Arendsen Hein Add instructions how to redo/finish failed merge with local working directory....	r3869	You can redo the full merge using:
		hg update 0
		hg update 1
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	diff -r f248da0d4c3e file1
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	--- a/file1
		+++ b/file1
Matt Mackall diff: don't show function name by default...	r5863	@@ -1,3 +1,7 @@
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	added file1
Thomas Arendsen Hein Extended test case to test dirstate length bug fixed in a7e95e3606c7.	r864	another line of text
Matt Mackall merge: allow smarter tool configuration...	r6004	+<<<<<<< local
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	+changed file1 different
		+=======
		changed file1
Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge...	r4387	+>>>>>>> other
Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.	r792	M file1
Matt Mackall merge: allow smarter tool configuration...	r6004	? file1.orig
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	f248da0d4c3e+ tip
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	reverting file1
Matt Mackall merge: allow smarter tool configuration...	r6004	? file1.orig
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	f248da0d4c3e tip
Matt Mackall merge: allow smarter tool configuration...	r6004	? file1.orig
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	f248da0d4c3e tip
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall merge: allow smarter tool configuration...	r6004	? file1.orig
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	f248da0d4c3e tip

	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