equal
deleted
inserted
replaced
115 |
115 |
116 $ hg rebase --continue |
116 $ hg rebase --continue |
117 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
117 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob) |
118 |
118 |
119 $ hg tglog |
119 $ hg tglog |
120 @ 9: 'r5' tags: 5.diff qtip tip |
120 @ 8: 'r5' tags: 5.diff qtip tip |
121 | |
|
122 o 8: 'r4' tags: 4.diff |
|
123 | |
121 | |
124 o 7: 'r2' tags: 2.diff qbase |
122 o 7: 'r2' tags: 2.diff qbase |
125 | |
123 | |
126 o 6: 'branch2-r6' tags: qparent |
124 o 6: 'branch2-r6' tags: qparent |
127 | |
125 | |
135 | |
133 | |
136 o 1: 'branch2-r1' tags: |
134 o 1: 'branch2-r1' tags: |
137 | |
135 | |
138 o 0: 'r0' tags: |
136 o 0: 'r0' tags: |
139 |
137 |
140 $ hg export --git 4.diff |
|
141 # HG changeset patch |
|
142 # User test |
|
143 # Date 0 0 |
|
144 # Node ID 315eb21a13c2b06e787f5d0000e36f8f8f3a1768 |
|
145 # Parent 1660ab13ce9aea3da22ea54926bd49aeff8a4e20 |
|
146 r4 |
|
147 |
|