79 | |
77 | |
80 x cc71ffbc7c00 (1) add foo.txt |
78 x cc71ffbc7c00 (1) add foo.txt |
81 rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
79 rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
82 rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
80 rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
83 |
81 |
84 $ hg evolve --list --rev . |
|
85 08bc7ba82799: add foo.txt |
|
86 content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00) |
|
87 |
|
88 $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
89 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
90 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
91 4 c17bf400a278 1969-12-31 23:59 -0000: |
|
92 6 08bc7ba82799 1969-12-31 23:59 -0000: |
|
93 $ hg evolve --content-divergent |
82 $ hg evolve --content-divergent |
94 merge:[6] add foo.txt |
83 merge:[6] add foo.txt |
95 with: [4] add foo.txt |
84 with: [4] add foo.txt |
96 base: [1] add foo.txt |
85 base: [1] add foo.txt |
97 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98 1 new orphan changesets |
87 1 new orphan changesets |
99 working directory is now at 459c64f7eaad |
88 working directory is now at 459c64f7eaad |
100 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
101 4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:459c64f7eaad |
|
102 7 459c64f7eaad 1969-12-31 23:59 -0000: |
|
103 |
|
104 date: updated one one side to an older value |
|
105 |
|
106 $ hg evolve -r . |
|
107 move:[7] add foo.txt |
|
108 atop:[0] add r0 |
|
109 working directory is now at 545776b4e79f |
|
110 $ hg update --hidden --rev 'predecessors(.)' |
|
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 updated to hidden changeset 459c64f7eaad |
|
113 (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f) |
|
114 working directory parent is obsolete! (459c64f7eaad) |
|
115 (use 'hg evolve' to update to its successor: 545776b4e79f) |
|
116 $ hg amend --date "0 3" |
|
117 1 new orphan changesets |
|
118 2 new content-divergent changesets |
|
119 $ hg rebase -r . -d 0 |
|
120 rebasing 9:c117f15338e6 "add foo.txt" (tip) |
|
121 $ hg log -G |
|
122 @ changeset: 10:7a09c7a39546 |
|
123 | tag: tip |
|
124 | parent: 0:a24ed8ad918c |
|
125 | user: test |
|
126 | date: Wed Dec 31 23:59:57 1969 -0000 |
|
127 | instability: content-divergent |
|
128 | summary: add foo.txt |
|
129 | |
|
130 | * changeset: 8:545776b4e79f |
|
131 |/ parent: 0:a24ed8ad918c |
|
132 | user: test |
|
133 | date: Wed Dec 31 23:59:58 1969 -0000 |
|
134 | instability: content-divergent |
|
135 | summary: add foo.txt |
|
136 | |
|
137 o changeset: 0:a24ed8ad918c |
|
138 user: test |
|
139 date: Thu Jan 01 00:00:00 1970 +0000 |
|
140 summary: add r0 |
|
141 |
|
142 $ hg evolve --list -r . |
|
143 7a09c7a39546: add foo.txt |
|
144 content-divergent: 545776b4e79f (draft) (precursor 459c64f7eaad) |
|
145 |
|
146 $ hg log -r 459c64f7eaad+7a09c7a39546+545776b4e79f --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
147 7 459c64f7eaad 1969-12-31 23:59 -0000: date-changed using amend as 9:c117f15338e6; rebased using evolve as 8:545776b4e79f |
|
148 10 7a09c7a39546 1969-12-31 23:59 -0000: |
|
149 8 545776b4e79f 1969-12-31 23:59 -0000: |
|
150 $ hg evolve --content-divergent |
|
151 merge:[8] add foo.txt |
|
152 with: [10] add foo.txt |
|
153 base: [7] add foo.txt |
|
154 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
155 working directory is now at 39c4200c0d94 |
|
156 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
157 11 39c4200c0d94 1969-12-31 23:59 -0000: |
|
158 |
|
159 date: updated one side to an newer value |
|
160 |
|
161 $ hg update --hidden --rev 'predecessors(.)' |
|
162 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
163 updated to hidden changeset 7a09c7a39546 |
|
164 (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94) |
|
165 working directory parent is obsolete! (7a09c7a39546) |
|
166 (use 'hg evolve' to update to its successor: 39c4200c0d94) |
|
167 $ hg amend --date "120 0" |
|
168 2 new content-divergent changesets |
|
169 $ hg log -G |
|
170 @ changeset: 12:da3be3d72fe2 |
|
171 | tag: tip |
|
172 | parent: 0:a24ed8ad918c |
|
173 | user: test |
|
174 | date: Thu Jan 01 00:02:00 1970 +0000 |
|
175 | instability: content-divergent |
|
176 | summary: add foo.txt |
|
177 | |
|
178 | * changeset: 11:39c4200c0d94 |
|
179 |/ parent: 0:a24ed8ad918c |
|
180 | user: test |
|
181 | date: Wed Dec 31 23:59:57 1969 -0000 |
|
182 | instability: content-divergent |
|
183 | summary: add foo.txt |
|
184 | |
|
185 o changeset: 0:a24ed8ad918c |
|
186 user: test |
|
187 date: Thu Jan 01 00:00:00 1970 +0000 |
|
188 summary: add r0 |
|
189 |
|
190 $ hg evolve --list -r . |
|
191 da3be3d72fe2: add foo.txt |
|
192 content-divergent: 39c4200c0d94 (draft) (precursor 7a09c7a39546) |
|
193 |
|
194 $ hg up 39c4200c0d94 |
|
195 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 $ hg log -r 7a09c7a39546+39c4200c0d94+da3be3d72fe2 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
197 10 7a09c7a39546 1969-12-31 23:59 -0000: date-changed using amend as 12:da3be3d72fe2; rewritten using evolve as 11:39c4200c0d94 |
|
198 11 39c4200c0d94 1969-12-31 23:59 -0000: |
|
199 12 da3be3d72fe2 1970-01-01 00:02 +0000: |
|
200 $ hg evolve --content-divergent |
|
201 merge:[11] add foo.txt |
|
202 with: [12] add foo.txt |
|
203 base: [10] add foo.txt |
|
204 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 working directory is now at 06cde6010a51 |
|
206 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
207 13 06cde6010a51 1970-01-01 00:02 +0000: |
|
208 |
|
209 date: updated each side to a different value, newer should win |
|
210 |
|
211 $ hg amend --date "235 0" |
|
212 $ hg update --hidden --rev 'predecessors(.)' |
|
213 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
214 updated to hidden changeset 06cde6010a51 |
|
215 (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3) |
|
216 working directory parent is obsolete! (06cde6010a51) |
|
217 (use 'hg evolve' to update to its successor: a7412ff9bfb3) |
|
218 $ hg amend --date "784 0" |
|
219 2 new content-divergent changesets |
|
220 $ hg log -G |
|
221 @ changeset: 15:e3077936ec52 |
|
222 | tag: tip |
|
223 | parent: 0:a24ed8ad918c |
|
224 | user: test |
|
225 | date: Thu Jan 01 00:13:04 1970 +0000 |
|
226 | instability: content-divergent |
|
227 | summary: add foo.txt |
|
228 | |
|
229 | * changeset: 14:a7412ff9bfb3 |
|
230 |/ parent: 0:a24ed8ad918c |
|
231 | user: test |
|
232 | date: Thu Jan 01 00:03:55 1970 +0000 |
|
233 | instability: content-divergent |
|
234 | summary: add foo.txt |
|
235 | |
|
236 o changeset: 0:a24ed8ad918c |
|
237 user: test |
|
238 date: Thu Jan 01 00:00:00 1970 +0000 |
|
239 summary: add r0 |
|
240 |
|
241 $ hg evolve --list -r . |
|
242 e3077936ec52: add foo.txt |
|
243 content-divergent: a7412ff9bfb3 (draft) (precursor 06cde6010a51) |
|
244 |
|
245 $ hg log -r 39c4200c0d94+a7412ff9bfb3+e3077936ec52 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
246 11 39c4200c0d94 1969-12-31 23:59 -0000: date-changed using evolve as 13:06cde6010a51 |
|
247 14 a7412ff9bfb3 1970-01-01 00:03 +0000: |
|
248 15 e3077936ec52 1970-01-01 00:13 +0000: |
|
249 $ hg evolve --content-divergent |
|
250 merge:[14] add foo.txt |
|
251 with: [15] add foo.txt |
|
252 base: [13] add foo.txt |
|
253 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
254 working directory is now at 1a39f3901288 |
|
255 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
256 16 1a39f3901288 1970-01-01 00:13 +0000: |
|