equal
deleted
inserted
replaced
84 o 5:[0-9a-f]{12} a (re) |
84 o 5:[0-9a-f]{12} a (re) |
85 |
85 |
86 o 4:[0-9a-f]{12} a (re) |
86 o 4:[0-9a-f]{12} a (re) |
87 |
87 |
88 |
88 |
|
89 check move data kept after rebase on touch: |
|
90 |
|
91 $ touch gna1 |
|
92 $ hg commit -Am gna1 |
|
93 adding gna1 |
|
94 $ hg mv gna1 gna2 |
|
95 $ hg commit -m move |
|
96 $ hg st -C --change=tip |
|
97 A gna2 |
|
98 gna1 |
|
99 R gna1 |
|
100 $ hg up .^ |
|
101 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
102 |
|
103 $ hg touch |
|
104 1 new unstable changesets |
|
105 |
|
106 $ hg rebase -s 11 -d 12 |
|
107 $ hg st -C --change=tip |
|
108 A gna2 |
|
109 gna1 |
|
110 R gna1 |