mirror of
				https://github.com/mnauw/git-remote-hg.git
				synced 2025-11-03 10:05:48 +01:00 
			
		
		
		
	test: add expected output
Generated with: hg:6.3 hggit:1.0.1 dulwich:0.20.50 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
		
							
								
								
									
										60
									
								
								test/expected/converged merge/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								test/expected/converged merge/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,60 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 2
 | 
			
		||||
A
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 7
 | 
			
		||||
origin
 | 
			
		||||
M 100644 :1 afile
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 2
 | 
			
		||||
C
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 3 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 3 +0000
 | 
			
		||||
data 5
 | 
			
		||||
A->C
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :3 afile
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :5
 | 
			
		||||
data 2
 | 
			
		||||
B
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :6
 | 
			
		||||
author A U Thor <author@example.com> 1 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 1 +0000
 | 
			
		||||
data 5
 | 
			
		||||
A->B
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :5 afile
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :7
 | 
			
		||||
author A U Thor <author@example.com> 2 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 2 +0000
 | 
			
		||||
data 5
 | 
			
		||||
B->C
 | 
			
		||||
from :6
 | 
			
		||||
M 100644 :3 afile
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :8
 | 
			
		||||
author A U Thor <author@example.com> 4 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 4 +0000
 | 
			
		||||
data 6
 | 
			
		||||
merge
 | 
			
		||||
from :4
 | 
			
		||||
merge :7
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										67
									
								
								test/expected/converged merge/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								test/expected/converged merge/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,67 @@
 | 
			
		||||
changeset:   9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    331ac2e605f2e6092ccb3802244a65b71f3be726
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
origin
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   ead35d346ecb18ce9d9d54604ff62b41caa196ce
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    894f8ad9a84f743d52747963d0b9f4e9cf37d489
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:01 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
A->B
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   541c7bc8b2d01c8bf71b2298d17edcda120e49bf
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      ead35d346ecb18ce9d9d54604ff62b41caa196ce
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    04dae4001cb1fb2384111589720617c4b742044c
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:02 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
B->C
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   5694aadcd7171ecb9768b13e29d027e22a360d44
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    6efc6bb8e097947aa212887bdb01fb89dfa3de13
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:03 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
A->C
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   9ee75b4362cc15f9110d6538b2f1c9f0cf14825a
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      5694aadcd7171ecb9768b13e29d027e22a360d44
 | 
			
		||||
parent:      541c7bc8b2d01c8bf71b2298d17edcda120e49bf
 | 
			
		||||
manifest:    eb9f4687448653e876d787cd6f2e59140680ff09
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:04 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
merge
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										56
									
								
								test/expected/encoding/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								test/expected/encoding/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,56 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 12
 | 
			
		||||
add älphà
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 5
 | 
			
		||||
beta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author tést èncödîng <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 9
 | 
			
		||||
add beta
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :3 beta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :5
 | 
			
		||||
data 6
 | 
			
		||||
gamma
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :6
 | 
			
		||||
author tést èncödîng <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 12
 | 
			
		||||
add gämmâ
 | 
			
		||||
from :4
 | 
			
		||||
M 100644 :5 gamma
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :7
 | 
			
		||||
data 6
 | 
			
		||||
delta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :8
 | 
			
		||||
author tést èncödîng <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 12
 | 
			
		||||
add déltà
 | 
			
		||||
from :6
 | 
			
		||||
M 100644 :7 delta
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										58
									
								
								test/expected/encoding/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										58
									
								
								test/expected/encoding/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,58 @@
 | 
			
		||||
changeset:   6674f1c866b5c428db4acde16404c14077889646
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      7e9fd3fd2f75d7de4bf3d77c47f192a51927ac28
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    ea49f93388380ead5601c8fcbfa187516e7c2ed8
 | 
			
		||||
user:        tést èncödîng <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      delta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add déltà
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   7e9fd3fd2f75d7de4bf3d77c47f192a51927ac28
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      99c5adad03b9a9935e181f4be91ff7693a790110
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    f580e7da3673c137370da2b931a1dee83590d7b4
 | 
			
		||||
user:        tést èncödîng <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      gamma
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add gämmâ
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   99c5adad03b9a9935e181f4be91ff7693a790110
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      1e3e49d2cc8feaad4942d100108f20f207742d3a
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    f0bd6fbafbaebe4bb59c35108428f6fce152431d
 | 
			
		||||
user:        tést èncödîng <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      beta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   1e3e49d2cc8feaad4942d100108f20f207742d3a
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add älphà
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										32
									
								
								test/expected/executable bit/log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								test/expected/executable bit/log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 10
 | 
			
		||||
add alpha
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :3
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 19
 | 
			
		||||
set executable bit
 | 
			
		||||
from :2
 | 
			
		||||
M 100755 :1 alpha
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 21
 | 
			
		||||
clear executable bit
 | 
			
		||||
from :3
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										46
									
								
								test/expected/executable bit/output
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								test/expected/executable bit/output
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,46 @@
 | 
			
		||||
changeset:   1efb93106a36bf71352ab04e769a3422522cf946
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      d7cae8b1fdab97568ba5eca44ca2bf5a44d7c394
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    51e6255d794f794a8c4e0f03edf264444e3c5ce7
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files:       alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
clear executable bit
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   d7cae8b1fdab97568ba5eca44ca2bf5a44d7c394
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    e4bf4ef5e9aea7a6a57573e533a5519bd062f144
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files:       alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
set executable bit
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
644   alpha
 | 
			
		||||
644   alpha
 | 
			
		||||
							
								
								
									
										60
									
								
								test/expected/file removal/log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								test/expected/file removal/log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,60 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 10
 | 
			
		||||
add alpha
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 5
 | 
			
		||||
beta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 9
 | 
			
		||||
add beta
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :3 beta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :5
 | 
			
		||||
data 5
 | 
			
		||||
blah
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :6
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 8
 | 
			
		||||
add foo
 | 
			
		||||
from :4
 | 
			
		||||
M 100644 :5 foo/bar
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :7
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 13
 | 
			
		||||
remove alpha
 | 
			
		||||
from :6
 | 
			
		||||
D alpha
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :8
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 15
 | 
			
		||||
remove foo/bar
 | 
			
		||||
from :7
 | 
			
		||||
D foo/bar
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										75
									
								
								test/expected/file removal/output
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										75
									
								
								test/expected/file removal/output
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,75 @@
 | 
			
		||||
changeset:   54f595cbdf1f516dc3b2b25faa6f051aae712f5d
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      7fe32a9185c6d37db430ee5248cdb2ae66582478
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    3f83f42fa00fb0cac14a83aa48baac2f287a9329
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files-:      foo/bar
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
remove foo/bar
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   7fe32a9185c6d37db430ee5248cdb2ae66582478
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      a21fd0b26a555427c2ea72f8ed37190f6216f705
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    cd10925837609b99d345c44c85bd1f73d742cbbc
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files-:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
remove alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   a21fd0b26a555427c2ea72f8ed37190f6216f705
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      7cd99375c843931bd8959b766a94e050f428512b
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    a6ee442a94bfc6fb0b7d717183bb8b4534ca4ccd
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      foo/bar
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add foo
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   7cd99375c843931bd8959b766a94e050f428512b
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    f0bd6fbafbaebe4bb59c35108428f6fce152431d
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      beta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
beta
 | 
			
		||||
foo/bar
 | 
			
		||||
beta
 | 
			
		||||
							
								
								
									
										32
									
								
								test/expected/git tags/log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								test/expected/git tags/log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
			
		||||
changeset:   7cd99375c843931bd8959b766a94e050f428512b
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         beta
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    f0bd6fbafbaebe4bb59c35108428f6fce152431d
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      beta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
tag:         alpha
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										141
									
								
								test/expected/hg author/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										141
									
								
								test/expected/hg author/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,141 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/not-master
 | 
			
		||||
commit refs/heads/not-master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 10
 | 
			
		||||
add alpha
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 5
 | 
			
		||||
beta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author test <none@none> 0 +0000
 | 
			
		||||
committer test <none@none> 0 +0000
 | 
			
		||||
data 9
 | 
			
		||||
add beta
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :3 beta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :5
 | 
			
		||||
data 11
 | 
			
		||||
beta
 | 
			
		||||
gamma
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :6
 | 
			
		||||
author test ext:(%20%28comment%29) <test@example.com> 0 +0000
 | 
			
		||||
committer test ext:(%20%28comment%29) <test@example.com> 0 +0000
 | 
			
		||||
data 12
 | 
			
		||||
modify beta
 | 
			
		||||
from :4
 | 
			
		||||
M 100644 :5 beta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :7
 | 
			
		||||
data 6
 | 
			
		||||
gamma
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :8
 | 
			
		||||
author  <test@example.com> 0 +0000
 | 
			
		||||
committer  <test@example.com> 0 +0000
 | 
			
		||||
data 10
 | 
			
		||||
add gamma
 | 
			
		||||
from :6
 | 
			
		||||
M 100644 :7 gamma
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :9
 | 
			
		||||
data 6
 | 
			
		||||
delta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :10
 | 
			
		||||
author name <test@example.com> 0 +0000
 | 
			
		||||
committer name <test@example.com> 0 +0000
 | 
			
		||||
data 10
 | 
			
		||||
add delta
 | 
			
		||||
from :8
 | 
			
		||||
M 100644 :9 delta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :11
 | 
			
		||||
data 8
 | 
			
		||||
epsilon
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :12
 | 
			
		||||
author name <test@example.com> 0 +0000
 | 
			
		||||
committer name <test@example.com> 0 +0000
 | 
			
		||||
data 12
 | 
			
		||||
add epsilon
 | 
			
		||||
from :10
 | 
			
		||||
M 100644 :11 epsilon
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :13
 | 
			
		||||
data 5
 | 
			
		||||
zeta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :14
 | 
			
		||||
author test <none@none> 0 +0000
 | 
			
		||||
committer test <none@none> 0 +0000
 | 
			
		||||
data 9
 | 
			
		||||
add zeta
 | 
			
		||||
from :12
 | 
			
		||||
M 100644 :13 zeta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :15
 | 
			
		||||
data 4
 | 
			
		||||
eta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :16
 | 
			
		||||
author test <test@example.com> 0 +0000
 | 
			
		||||
committer test <test@example.com> 0 +0000
 | 
			
		||||
data 8
 | 
			
		||||
add eta
 | 
			
		||||
from :14
 | 
			
		||||
M 100644 :15 eta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :17
 | 
			
		||||
data 6
 | 
			
		||||
theta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :18
 | 
			
		||||
author test ?test@example.com <test ?test@example.com> 0 +0000
 | 
			
		||||
committer test ?test@example.com <test ?test@example.com> 0 +0000
 | 
			
		||||
data 10
 | 
			
		||||
add theta
 | 
			
		||||
from :16
 | 
			
		||||
M 100644 :17 theta
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :19
 | 
			
		||||
data 5
 | 
			
		||||
iota
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :20
 | 
			
		||||
author test ext:(%20example%20%3Cdot%3E%20com%3E) <test ?at> 0 +0000
 | 
			
		||||
committer test ext:(%20example%20%3Cdot%3E%20com%3E) <test ?at> 0 +0000
 | 
			
		||||
data 9
 | 
			
		||||
add iota
 | 
			
		||||
from :18
 | 
			
		||||
M 100644 :19 iota
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										134
									
								
								test/expected/hg author/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										134
									
								
								test/expected/hg author/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,134 @@
 | 
			
		||||
changeset:   307c03466a07cccafaafc991f36d695d6ad595f3
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      5832614d351449a2f8d6f7ccbef4877c2b18cbe0
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    e8f1b3ae088bdd25e3570a4953ccb6b948524473
 | 
			
		||||
user:        test <test ?at> example <dot> com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      iota
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add iota
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   5832614d351449a2f8d6f7ccbef4877c2b18cbe0
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      e52ded4aca5d210ed58c63158d64fb911876f345
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    7e4875db7e2970c529f462520121d333e514bf4d
 | 
			
		||||
user:        test ?test@example.com <test ?test@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      theta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add theta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   e52ded4aca5d210ed58c63158d64fb911876f345
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a34ba7d552e8b73ad306baf1d1eb83de0f74c12
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    ef03e54a9916ac3158c9686503dd4f609c26b3ec
 | 
			
		||||
user:        test <test@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      eta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add eta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   9a34ba7d552e8b73ad306baf1d1eb83de0f74c12
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      6281edc25b9fe9538407726f044a9a61ac7ba5bc
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    616201b85baf7ed02d41f6a7deb04c52009d8483
 | 
			
		||||
user:        test
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      zeta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add zeta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   6281edc25b9fe9538407726f044a9a61ac7ba5bc
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      4c7841053c633cb51f8375555d08b6bea54fc4cb
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    c703b3d7be8a0638047142f57ff83d4e94b5d1fa
 | 
			
		||||
user:        name <test@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      epsilon
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add epsilon
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   4c7841053c633cb51f8375555d08b6bea54fc4cb
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      fa8f26586397dd4797842e9300c8db221fe5514d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    300b54001cbfa5d027b4bccdb594ccb463adb55d
 | 
			
		||||
user:        name <test@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      delta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add delta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   fa8f26586397dd4797842e9300c8db221fe5514d
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      2708ff417fb7e2c0a4f9596286c0a398553fa793
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    45b0c483a79307d14f7e234feb78776478f828ec
 | 
			
		||||
user:        <test@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      gamma
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add gamma
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   2708ff417fb7e2c0a4f9596286c0a398553fa793
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      8c51e5fe974fe1cc63a56bbfad343f9ede6bed30
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    c305998040b12e956b998318982c9eb92d2d7b28
 | 
			
		||||
user:        test <test@example.com> (comment)
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files:       beta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
modify beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   8c51e5fe974fe1cc63a56bbfad343f9ede6bed30
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    f0bd6fbafbaebe4bb59c35108428f6fce152431d
 | 
			
		||||
user:        test
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      beta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
bookmark:    not-master
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										38
									
								
								test/expected/hg branch/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										38
									
								
								test/expected/hg branch/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,38 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/not-master
 | 
			
		||||
commit refs/heads/not-master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 10
 | 
			
		||||
add alpha
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :3
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 52
 | 
			
		||||
rename alpha to beta
 | 
			
		||||
 | 
			
		||||
--HG--
 | 
			
		||||
rename : alpha => beta
 | 
			
		||||
from :2
 | 
			
		||||
D alpha
 | 
			
		||||
M 100644 :1 beta
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 44
 | 
			
		||||
started branch gamma
 | 
			
		||||
 | 
			
		||||
--HG--
 | 
			
		||||
branch : gamma
 | 
			
		||||
from :3
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										44
									
								
								test/expected/hg branch/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								test/expected/hg branch/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,44 @@
 | 
			
		||||
changeset:   3320583a8de0b31511f499a4ab3426bee1a7f478
 | 
			
		||||
branch:      gamma
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      5889597089fea2d144989baa9427d1a080293fdb
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    e353b4d5282d044ad738398fd32d0b684d04a14b
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
extra:       branch=gamma
 | 
			
		||||
description:
 | 
			
		||||
started branch gamma
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   5889597089fea2d144989baa9427d1a080293fdb
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    e353b4d5282d044ad738398fd32d0b684d04a14b
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      beta
 | 
			
		||||
files-:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
rename alpha to beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
bookmark:    not-master
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										33
									
								
								test/expected/hg tags/output
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								test/expected/hg tags/output
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
			
		||||
alpha
 | 
			
		||||
changeset:   16869bbe54be9f8082a8aec346de09f6c05cf1de
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    26f8145fb5b20cc6f70dd131b646f95ab79738c0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      .hgtags
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
Added tag alpha for changeset 362b656574c3
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
bookmark:    not-master
 | 
			
		||||
tag:         alpha
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
362b656574c3c9e89fa7f2d7a943091dc93bce4d alpha
 | 
			
		||||
							
								
								
									
										51
									
								
								test/expected/merge conflict 1/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								test/expected/merge conflict 1/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,51 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 2
 | 
			
		||||
A
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 7
 | 
			
		||||
origin
 | 
			
		||||
M 100644 :1 afile
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 2
 | 
			
		||||
C
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 2 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 2 +0000
 | 
			
		||||
data 5
 | 
			
		||||
A->C
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :3 afile
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :5
 | 
			
		||||
data 2
 | 
			
		||||
B
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :6
 | 
			
		||||
author A U Thor <author@example.com> 1 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 1 +0000
 | 
			
		||||
data 5
 | 
			
		||||
A->B
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :5 afile
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :7
 | 
			
		||||
author A U Thor <author@example.com> 3 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 3 +0000
 | 
			
		||||
data 11
 | 
			
		||||
merge to C
 | 
			
		||||
from :4
 | 
			
		||||
merge :6
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										54
									
								
								test/expected/merge conflict 1/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								test/expected/merge conflict 1/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,54 @@
 | 
			
		||||
changeset:   9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    331ac2e605f2e6092ccb3802244a65b71f3be726
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
origin
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   ead35d346ecb18ce9d9d54604ff62b41caa196ce
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    894f8ad9a84f743d52747963d0b9f4e9cf37d489
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:01 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
A->B
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   d585ac55494928500f510b965b878d47f9ee60f6
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    6efc6bb8e097947aa212887bdb01fb89dfa3de13
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:02 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
A->C
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   c6ab734e24c39948e5a25713b48f4972c960ff8b
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      d585ac55494928500f510b965b878d47f9ee60f6
 | 
			
		||||
parent:      ead35d346ecb18ce9d9d54604ff62b41caa196ce
 | 
			
		||||
manifest:    96bedb13781f1b9d729a2210a530f0c5c68f42e6
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:03 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
merge to C
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										52
									
								
								test/expected/merge conflict 2/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								test/expected/merge conflict 2/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,52 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 2
 | 
			
		||||
A
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 7
 | 
			
		||||
origin
 | 
			
		||||
M 100644 :1 afile
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 2
 | 
			
		||||
C
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 2 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 2 +0000
 | 
			
		||||
data 5
 | 
			
		||||
A->C
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :3 afile
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :5
 | 
			
		||||
data 2
 | 
			
		||||
B
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :6
 | 
			
		||||
author A U Thor <author@example.com> 1 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 1 +0000
 | 
			
		||||
data 5
 | 
			
		||||
A->B
 | 
			
		||||
from :2
 | 
			
		||||
M 100644 :5 afile
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :7
 | 
			
		||||
author A U Thor <author@example.com> 3 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 3 +0000
 | 
			
		||||
data 11
 | 
			
		||||
merge to B
 | 
			
		||||
from :4
 | 
			
		||||
merge :6
 | 
			
		||||
M 100644 :5 afile
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										54
									
								
								test/expected/merge conflict 2/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								test/expected/merge conflict 2/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,54 @@
 | 
			
		||||
changeset:   9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    331ac2e605f2e6092ccb3802244a65b71f3be726
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
origin
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   ead35d346ecb18ce9d9d54604ff62b41caa196ce
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    894f8ad9a84f743d52747963d0b9f4e9cf37d489
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:01 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
A->B
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   d585ac55494928500f510b965b878d47f9ee60f6
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      9a6668f453c3003b71e11bb8d7572af57a7ce891
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    6efc6bb8e097947aa212887bdb01fb89dfa3de13
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:02 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
A->C
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   542b187b70e70dc759631d1065794f3c2c5a3e7b
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      d585ac55494928500f510b965b878d47f9ee60f6
 | 
			
		||||
parent:      ead35d346ecb18ce9d9d54604ff62b41caa196ce
 | 
			
		||||
manifest:    0907d7dbc98790102fa6cb91b68b271ef0bc5b64
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:03 1970 +0000
 | 
			
		||||
files:       afile
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
merge to B
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										27
									
								
								test/expected/rename/git-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								test/expected/rename/git-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,27 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 10
 | 
			
		||||
add alpha
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :3
 | 
			
		||||
author A U Thor <author@example.com> 0 +0000
 | 
			
		||||
committer A U Thor <author@example.com> 0 +0000
 | 
			
		||||
data 52
 | 
			
		||||
rename alpha to beta
 | 
			
		||||
 | 
			
		||||
--HG--
 | 
			
		||||
rename : alpha => beta
 | 
			
		||||
from :2
 | 
			
		||||
D alpha
 | 
			
		||||
M 100644 :1 beta
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										29
									
								
								test/expected/rename/hg-log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								test/expected/rename/hg-log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,29 @@
 | 
			
		||||
changeset:   a985b184598fd779e53576c65c5dd1d274736c73
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      0558a161e3ca0d59f5f165e3182402d9f1e574a8
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    e353b4d5282d044ad738398fd32d0b684d04a14b
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      beta
 | 
			
		||||
files-:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
rename alpha to beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   0558a161e3ca0d59f5f165e3182402d9f1e574a8
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Thu Jan 01 00:00:00 1970 +0000
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										27
									
								
								test/expected/symlink/log
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								test/expected/symlink/log
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,27 @@
 | 
			
		||||
blob
 | 
			
		||||
mark :1
 | 
			
		||||
data 6
 | 
			
		||||
alpha
 | 
			
		||||
 | 
			
		||||
reset refs/heads/master
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :2
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 10
 | 
			
		||||
add alpha
 | 
			
		||||
M 100644 :1 alpha
 | 
			
		||||
 | 
			
		||||
blob
 | 
			
		||||
mark :3
 | 
			
		||||
data 5
 | 
			
		||||
alpha
 | 
			
		||||
commit refs/heads/master
 | 
			
		||||
mark :4
 | 
			
		||||
author A U Thor <author@example.com> 1167600600 +0230
 | 
			
		||||
committer C O Mitter <committer@example.com> 1167600600 +0230
 | 
			
		||||
data 9
 | 
			
		||||
add beta
 | 
			
		||||
from :2
 | 
			
		||||
M 120000 :3 beta
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										32
									
								
								test/expected/symlink/output
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								test/expected/symlink/output
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
			
		||||
changeset:   87cbc97576079d3dfef04c678bfc8ab69999ebdf
 | 
			
		||||
bookmark:    master
 | 
			
		||||
tag:         tip
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    4950f48a7f5b0ce6f31c2f4307e296dbac652026
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      beta
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add beta
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
changeset:   362b656574c3c9e89fa7f2d7a943091dc93bce4d
 | 
			
		||||
phase:       draft
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
parent:      -0000000000000000000000000000000000000000
 | 
			
		||||
manifest:    8b8a0e87dfd7a0706c0524afa8ba67e20544cbf0
 | 
			
		||||
user:        A U Thor <author@example.com>
 | 
			
		||||
date:        Mon Jan 01 00:00:00 2007 +0230
 | 
			
		||||
files+:      alpha
 | 
			
		||||
extra:       branch=default
 | 
			
		||||
extra:       committer=C O Mitter <committer@example.com> 1167600600 -9000
 | 
			
		||||
description:
 | 
			
		||||
add alpha
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
644   alpha
 | 
			
		||||
644 @ beta
 | 
			
		||||
		Reference in New Issue
	
	Block a user