equal
deleted
inserted
replaced
198 echo '% log -p -R repo' |
198 echo '% log -p -R repo' |
199 cd dir |
199 cd dir |
200 hg log -p -R .. ../a |
200 hg log -p -R .. ../a |
201 |
201 |
202 |
202 |
|
203 cd .. |
|
204 hg init follow2 |
|
205 cd follow2 |
|
206 |
|
207 # Build the following history: |
|
208 # tip - o - x - o - x - x |
|
209 # \ / |
|
210 # o - o - o - x |
|
211 # \ / |
|
212 # o |
|
213 # |
|
214 # Where "o" is a revision containing "foo" and |
|
215 # "x" is a revision without "foo" |
|
216 touch init |
|
217 hg ci -A -m "init, unrelated" |
|
218 echo 'foo' > init |
|
219 hg ci -m "change, unrelated" |
|
220 echo 'foo' > foo |
|
221 hg ci -A -m "add unrelated old foo" |
|
222 hg rm foo |
|
223 hg ci -m "delete foo, unrelated" |
|
224 echo 'related' > foo |
|
225 hg ci -A -m "add foo, related" |
|
226 |
|
227 hg up 0 |
|
228 touch branch |
|
229 hg ci -A -m "first branch, unrelated" |
|
230 touch foo |
|
231 hg ci -A -m "create foo, related" |
|
232 echo 'change' > foo |
|
233 hg ci -m "change foo, related" |
|
234 |
|
235 hg up 6 |
|
236 echo 'change foo in branch' > foo |
|
237 hg ci -m "change foo in branch, related" |
|
238 hg merge 7 |
|
239 echo 'merge 1' > foo |
|
240 hg resolve -m foo |
|
241 hg ci -m "First merge, related" |
|
242 |
|
243 hg merge 4 |
|
244 echo 'merge 2' > foo |
|
245 hg resolve -m foo |
|
246 hg ci -m "Last merge, related" |
|
247 |
|
248 hg --config "extensions.graphlog=" glog |
|
249 |
|
250 hg --traceback log -f foo |
|
251 |
203 exit 0 |
252 exit 0 |