view tests/test-merge8.t @ 35473:02f54a1ec9eb

lfs: add note messages indicating what store holds the lfs blob

The following corruption related patches were written prior to adding the user
level cache, and it took awhile to track down why the tests changed.  (It
generally made things more resilient.)  But I think this will be useful to the
end user as well.  I didn't make it --debug level, because there can be a ton of
info coming out of clone/push/pull --debug.  The pointers are sorted for test
stability.

I opted for ui.note() instead of checking ui.verbose and then using ui.write()
for convenience, but I see most of this extension does the latter.  I have no
idea what the preferred form is.

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  new changesets e3c9b40284e1:772b37f1ca37
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ cd ..