Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-resolve.t
changeset 46811 5a0b930cfb3e
parent 46418 dc00324e80f4
child 48427 38941a28406a
equal deleted inserted replaced
46809:56d441256e82 46811:5a0b930cfb3e 
   253   file: file1 (state "r")
 
   253   file: file1 (state "r")
 
   254     local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
 
   254     local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
 
   255     ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
 
   255     ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
 
   256     other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
 
   256     other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
 
   257     extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
 
   257     extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
 
       
   258     extra: merged = yes
 
   258   file: file2 (state "u")
 
   259   file: file2 (state "u")
 
   259     local path: file2 (hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523, flags "")
 
   260     local path: file2 (hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523, flags "")
 
   260     ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
 
   261     ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
 
   261     other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
 
   262     other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
 
   262     extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
 
   263     extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
 
       
   264     extra: merged = yes
 
   263   $ hg resolve -l
 
   265   $ hg resolve -l
 
   264   R file1
 
   266   R file1
 
   265   U file2
 
   267   U file2
 
   266 
   268 
   267 test json output
 
   269 test json output
 
   269   $ hg debugmergestate -T json
 
   271   $ hg debugmergestate -T json
 
   270   [
 
   272   [
 
   271    {
 
   273    {
 
   272     "commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}],
 
   274     "commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}],
 
   273     "extras": [],
 
   275     "extras": [],
 
   274     "files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}]
 
   276     "files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}, {"key": "merged", "value": "yes"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}, {"key": "merged", "value": "yes"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}]
 
   275    }
 
   277    }
 
   276   ]
 
   278   ]
 
   277 
   279 
   278 
   280 
   279 insert unsupported mandatory merge record
 
   281 insert unsupported mandatory merge record
mercurial