equal
deleted
inserted
replaced
46 3 Added branch1 file |
46 3 Added branch1 file |
47 2 Added parent file |
47 2 Added parent file |
48 1 Added brach2 file |
48 1 Added brach2 file |
49 0 Merged branches |
49 0 Merged branches |
50 $ glog -R source-hg |
50 $ glog -R source-hg |
51 o 5 "(octopus merge fixup)" files: |
51 o 5@source "(octopus merge fixup)" files: |
52 |\ |
52 |\ |
53 | o 4 "Merged branches" files: file-branch2 |
53 | o 4@source "Merged branches" files: file-branch2 |
54 | |\ |
54 | |\ |
55 o---+ 3 "Added brach2 file" files: file-branch2 |
55 o---+ 3@source-branch2 "Added brach2 file" files: file-branch2 |
56 / / |
56 / / |
57 | o 2 "Added parent file" files: file-parent |
57 | o 2@source "Added parent file" files: file-parent |
58 | | |
58 | | |
59 o | 1 "Added branch1 file" files: file file-branch1 |
59 o | 1@source-branch1 "Added branch1 file" files: file file-branch1 |
60 |/ |
60 |/ |
61 o 0 "Initial add" files: file |
61 o 0@source "Initial add" files: file |
62 |
62 |
63 $ manifest source-hg tip |
63 $ manifest source-hg tip |
64 % manifest of tip |
64 % manifest of tip |
65 644 file |
65 644 file |
66 644 file-branch1 |
66 644 file-branch1 |