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-backout.t
changeset 46811 5a0b930cfb3e
parent 45827 8d72e29ad1e0
child 48372 e9d588b28710
equal deleted inserted replaced
46809:56d441256e82 46811:5a0b930cfb3e 
   716   file: foo (state "u")
 
   716   file: foo (state "u")
 
   717     local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")
 
   717     local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")
 
   718     ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
 
   718     ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
 
   719     other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
 
   719     other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
 
   720     extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553
 
   720     extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553
 
       
   721     extra: merged = yes
 
   721   $ mv .hg/merge/state2 .hg/merge/state2-moved
 
   722   $ mv .hg/merge/state2 .hg/merge/state2-moved
 
   722   $ hg debugmergestate -v
 
   723   $ hg debugmergestate -v
 
   723   no version 2 merge state
 
   724   no version 2 merge state
 
   724   local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
 
   725   local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
 
   725   other: b71750c4b0fdf719734971e3ef90dbeab5919a2d
 
   726   other: b71750c4b0fdf719734971e3ef90dbeab5919a2d
mercurial