sapling/tests/test-merge-revert2.out

1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
9eca13a34789
9eca13a34789+
reverting file1
9eca13a34789
f248da0d4c3e tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
diff -r f248da0d4c3e file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@ added file1
 added file1
 another line of text
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
M file1
f248da0d4c3e+ tip
reverting file1
f248da0d4c3e tip
f248da0d4c3e tip
f248da0d4c3e tip
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems. 2006-03-13 15:05:41 +03:00			`1:f248da0d4c3e`
			`0:9eca13a34789`
			`f248da0d4c3e tip`
			`9eca13a34789`
			`9eca13a34789+`
rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93) 2006-03-31 22:37:25 +04:00			`reverting file1`
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems. 2006-03-13 15:05:41 +03:00			`9eca13a34789`
			`f248da0d4c3e tip`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`merge: warning: conflicts during merge`
			`merging file1`
			`merging file1 failed!`
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems. 2006-03-13 15:05:41 +03:00			`diff -r f248da0d4c3e file1`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`--- a/file1`
			`+++ b/file1`
Add new bdiff based unidiff generation. 2006-01-24 05:02:10 +03:00			`@@ -1,3 +1,7 @@ added file1`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`added file1`
Extended test case to test dirstate length bug fixed in 2abe02c00cbd. 2005-08-10 11:23:42 +04:00			`another line of text`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`+<<<<<<<`
			`+changed file1 different`
			`+=======`
			`changed file1`
			`+>>>>>>>`
			`M file1`
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems. 2006-03-13 15:05:41 +03:00			`f248da0d4c3e+ tip`
rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93) 2006-03-31 22:37:25 +04:00			`reverting file1`
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems. 2006-03-13 15:05:41 +03:00			`f248da0d4c3e tip`
			`f248da0d4c3e tip`
			`f248da0d4c3e tip`