equal
deleted
inserted
replaced
106 $ hg evolve -r . |
106 $ hg evolve -r . |
107 move:[7] add foo.txt |
107 move:[7] add foo.txt |
108 atop:[0] add r0 |
108 atop:[0] add r0 |
109 working directory is now at 545776b4e79f |
109 working directory is now at 545776b4e79f |
110 $ hg update --hidden --rev 'predecessors(.)' |
110 $ hg update --hidden --rev 'predecessors(.)' |
|
111 updating to a hidden changeset 459c64f7eaad |
|
112 (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f) |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
113 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) |
114 working directory parent is obsolete! (459c64f7eaad) |
115 (use 'hg evolve' to update to its successor: 545776b4e79f) |
115 (use 'hg evolve' to update to its successor: 545776b4e79f) |
116 $ hg amend --date "0 3" |
116 $ hg amend --date "0 3" |
117 1 new orphan changesets |
117 1 new orphan changesets |
118 2 new content-divergent changesets |
118 2 new content-divergent changesets |
157 11 39c4200c0d94 1969-12-31 23:59 -0000: |
157 11 39c4200c0d94 1969-12-31 23:59 -0000: |
158 |
158 |
159 date: updated one side to an newer value |
159 date: updated one side to an newer value |
160 |
160 |
161 $ hg update --hidden --rev 'predecessors(.)' |
161 $ hg update --hidden --rev 'predecessors(.)' |
162 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
162 updating to a hidden changeset 7a09c7a39546 |
163 updated to hidden changeset 7a09c7a39546 |
|
164 (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94) |
163 (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94) |
|
164 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
165 working directory parent is obsolete! (7a09c7a39546) |
165 working directory parent is obsolete! (7a09c7a39546) |
166 (use 'hg evolve' to update to its successor: 39c4200c0d94) |
166 (use 'hg evolve' to update to its successor: 39c4200c0d94) |
167 $ hg amend --date "120 0" |
167 $ hg amend --date "120 0" |
168 2 new content-divergent changesets |
168 2 new content-divergent changesets |
169 $ hg log -G |
169 $ hg log -G |
208 |
208 |
209 date: updated each side to a different value, newer should win |
209 date: updated each side to a different value, newer should win |
210 |
210 |
211 $ hg amend --date "235 0" |
211 $ hg amend --date "235 0" |
212 $ hg update --hidden --rev 'predecessors(.)' |
212 $ hg update --hidden --rev 'predecessors(.)' |
213 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
213 updating to a hidden changeset 06cde6010a51 |
214 updated to hidden changeset 06cde6010a51 |
|
215 (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3) |
214 (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3) |
|
215 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
216 working directory parent is obsolete! (06cde6010a51) |
216 working directory parent is obsolete! (06cde6010a51) |
217 (use 'hg evolve' to update to its successor: a7412ff9bfb3) |
217 (use 'hg evolve' to update to its successor: a7412ff9bfb3) |
218 $ hg amend --date "784 0" |
218 $ hg amend --date "784 0" |
219 2 new content-divergent changesets |
219 2 new content-divergent changesets |
220 $ hg log -G |
220 $ hg log -G |