Mercurial > hg
view tests/test-merge-remove.out @ 12132:8a0e5b0c0ba9
debugindex(dot): try to access filelogs through repo, if possible
If a repository is accesible, first treat the filename as a working copy file
and try to open its filelog. Fallback to opening the file directly as a
revlog, as before.
author | Sune Foldager <sune.foldager@edlund.dk> |
---|---|
date | Wed, 01 Sep 2010 15:03:45 +0200 |
parents | 369ddc9c0339 |
children |
line wrap: on
line source
created new head merging foo1 and foo to foo1 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 % removing foo1 and bar r 0 -2 bar r 0 -1 foo1 copy: foo -> foo1 R bar R foo1 % readding foo1 and bar adding bar adding foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo % reverting foo1 and bar saving current version of bar as bar.orig reverting bar saving current version of foo1 as foo1.orig reverting foo1 n 0 -2 bar m 644 14 foo1 copy: foo -> foo1 M bar M foo1 foo