equal
deleted
inserted
replaced
57 0 Merged branches |
57 0 Merged branches |
58 warning: can't find ancestor for 'renamed' copied from 'rename_me'! |
58 warning: can't find ancestor for 'renamed' copied from 'rename_me'! |
59 $ glog -R source-hg |
59 $ glog -R source-hg |
60 o 5@source "(octopus merge fixup)" files+: [], files-: [], files: [renamed] |
60 o 5@source "(octopus merge fixup)" files+: [], files-: [], files: [renamed] |
61 |\ |
61 |\ |
62 | o 4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file] |
62 | o 4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
63 | |\ |
63 | |\ |
64 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
64 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
65 / / |
65 / / |
66 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] |
66 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] |
67 | | |
67 | | |
152 |
152 |
153 |
153 |
154 $ glog -R hg2hg |
154 $ glog -R hg2hg |
155 @ 5@source "(octopus merge fixup)" files+: [], files-: [], files: [] |
155 @ 5@source "(octopus merge fixup)" files+: [], files-: [], files: [] |
156 |\ |
156 |\ |
157 | o 4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file] |
157 | o 4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
158 | |\ |
158 | |\ |
159 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
159 o---+ 3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: [] |
160 / / |
160 / / |
161 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] |
161 | o 2@source "Added parent file" files+: [file-parent], files-: [], files: [] |
162 | | |
162 | | |