equal
deleted
inserted
replaced
80 move:[2] babar count up to fifteen |
80 move:[2] babar count up to fifteen |
81 atop:[4] babar count up to ten |
81 atop:[4] babar count up to ten |
82 merging babar |
82 merging babar |
83 $ hg resolve -l |
83 $ hg resolve -l |
84 $ hg log -G |
84 $ hg log -G |
85 @ changeset: 5:800217d738cd |
85 @ changeset: 5:71c18f70c34f |
86 | tag: tip |
86 | tag: tip |
87 | user: test |
87 | user: test |
88 | date: Thu Jan 01 00:00:00 1970 +0000 |
88 | date: Thu Jan 01 00:00:00 1970 +0000 |
89 | summary: babar count up to fifteen |
89 | summary: babar count up to fifteen |
90 | |
90 | |
91 o changeset: 4:6bd654225435 |
91 o changeset: 4:5977072d13c5 |
92 | parent: 0:29ec1554cfaf |
92 | parent: 0:29ec1554cfaf |
93 | user: test |
93 | user: test |
94 | date: Thu Jan 01 00:00:00 1970 +0000 |
94 | date: Thu Jan 01 00:00:00 1970 +0000 |
95 | summary: babar count up to ten |
95 | summary: babar count up to ten |
96 | |
96 | |
107 $ hg gdown |
107 $ hg gdown |
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
109 [4] babar count up to ten |
109 [4] babar count up to ten |
110 $ safesed 's/dix/ten/' babar |
110 $ safesed 's/dix/ten/' babar |
111 $ hg diff |
111 $ hg diff |
112 diff -r 6bd654225435 babar |
112 diff -r 5977072d13c5 babar |
113 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
113 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
114 +++ b/babar * (glob) |
114 +++ b/babar * (glob) |
115 @@ -7,4 +7,4 @@ |
115 @@ -7,4 +7,4 @@ |
116 sept |
116 sept |
117 eight |
117 eight |
131 abort: unresolved merge conflicts (see hg help resolve) |
131 abort: unresolved merge conflicts (see hg help resolve) |
132 [255] |
132 [255] |
133 $ hg resolve -l |
133 $ hg resolve -l |
134 U babar |
134 U babar |
135 $ hg log -G |
135 $ hg log -G |
136 @ changeset: 7:3e191dd96e18 |
136 @ changeset: 7:e04690b09bc6 |
137 | tag: tip |
137 | tag: tip |
138 | parent: 0:29ec1554cfaf |
138 | parent: 0:29ec1554cfaf |
139 | user: test |
139 | user: test |
140 | date: Thu Jan 01 00:00:00 1970 +0000 |
140 | date: Thu Jan 01 00:00:00 1970 +0000 |
141 | summary: babar count up to ten |
141 | summary: babar count up to ten |
142 | |
142 | |
143 | @ changeset: 5:800217d738cd |
143 | @ changeset: 5:71c18f70c34f |
144 | | user: test |
144 | | user: test |
145 | | date: Thu Jan 01 00:00:00 1970 +0000 |
145 | | date: Thu Jan 01 00:00:00 1970 +0000 |
146 | | summary: babar count up to fifteen |
146 | | summary: babar count up to fifteen |
147 | | |
147 | | |
148 | x changeset: 4:6bd654225435 |
148 | x changeset: 4:5977072d13c5 |
149 |/ parent: 0:29ec1554cfaf |
149 |/ parent: 0:29ec1554cfaf |
150 | user: test |
150 | user: test |
151 | date: Thu Jan 01 00:00:00 1970 +0000 |
151 | date: Thu Jan 01 00:00:00 1970 +0000 |
152 | summary: babar count up to ten |
152 | summary: babar count up to ten |
153 | |
153 | |
164 $ hg resolve --all -m |
164 $ hg resolve --all -m |
165 $ hg evolve --continue |
165 $ hg evolve --continue |
166 grafting revision 5 |
166 grafting revision 5 |
167 $ hg resolve -l |
167 $ hg resolve -l |
168 $ hg log -G |
168 $ hg log -G |
169 @ changeset: 8:92429cce7036 |
169 @ changeset: 8:1836b91c6c1d |
170 | tag: tip |
170 | tag: tip |
171 | user: test |
171 | user: test |
172 | date: Thu Jan 01 00:00:00 1970 +0000 |
172 | date: Thu Jan 01 00:00:00 1970 +0000 |
173 | summary: babar count up to fifteen |
173 | summary: babar count up to fifteen |
174 | |
174 | |
175 o changeset: 7:3e191dd96e18 |
175 o changeset: 7:e04690b09bc6 |
176 | parent: 0:29ec1554cfaf |
176 | parent: 0:29ec1554cfaf |
177 | user: test |
177 | user: test |
178 | date: Thu Jan 01 00:00:00 1970 +0000 |
178 | date: Thu Jan 01 00:00:00 1970 +0000 |
179 | summary: babar count up to ten |
179 | summary: babar count up to ten |
180 | |
180 | |
191 $ hg gdown |
191 $ hg gdown |
192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
193 [7] babar count up to ten |
193 [7] babar count up to ten |
194 $ safesed 's/ten/zehn/' babar |
194 $ safesed 's/ten/zehn/' babar |
195 $ hg diff |
195 $ hg diff |
196 diff -r 3e191dd96e18 babar |
196 diff -r e04690b09bc6 babar |
197 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
197 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
198 +++ b/babar * (glob) |
198 +++ b/babar * (glob) |
199 @@ -7,4 +7,4 @@ |
199 @@ -7,4 +7,4 @@ |
200 sept |
200 sept |
201 eight |
201 eight |
218 abort: unresolved merge conflicts (see hg help resolve) |
218 abort: unresolved merge conflicts (see hg help resolve) |
219 [255] |
219 [255] |
220 $ hg resolve -l |
220 $ hg resolve -l |
221 U babar |
221 U babar |
222 $ hg log -G |
222 $ hg log -G |
223 @ changeset: 10:a7fe09efd4a1 |
223 @ changeset: 10:b20d08eea373 |
224 | tag: tip |
224 | tag: tip |
225 | parent: 0:29ec1554cfaf |
225 | parent: 0:29ec1554cfaf |
226 | user: test |
226 | user: test |
227 | date: Thu Jan 01 00:00:00 1970 +0000 |
227 | date: Thu Jan 01 00:00:00 1970 +0000 |
228 | summary: babar count up to ten |
228 | summary: babar count up to ten |
229 | |
229 | |
230 | @ changeset: 8:92429cce7036 |
230 | @ changeset: 8:1836b91c6c1d |
231 | | user: test |
231 | | user: test |
232 | | date: Thu Jan 01 00:00:00 1970 +0000 |
232 | | date: Thu Jan 01 00:00:00 1970 +0000 |
233 | | summary: babar count up to fifteen |
233 | | summary: babar count up to fifteen |
234 | | |
234 | | |
235 | x changeset: 7:3e191dd96e18 |
235 | x changeset: 7:e04690b09bc6 |
236 |/ parent: 0:29ec1554cfaf |
236 |/ parent: 0:29ec1554cfaf |
237 | user: test |
237 | user: test |
238 | date: Thu Jan 01 00:00:00 1970 +0000 |
238 | date: Thu Jan 01 00:00:00 1970 +0000 |
239 | summary: babar count up to ten |
239 | summary: babar count up to ten |
240 | |
240 | |