view tests/test-rename-dir-merge2.out @ 9014:87c05a78e588

test python hook configured with python:[file]:[hook] syntax Adds a test for python hooks configured with python:[file]:[hook] syntax in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85) to 96% (82/85).
author Henri Wiechers <hwiechers@gmail.com>
date Fri, 26 Jun 2009 14:42:05 +0200
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line source

adding a/f
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving a/f to b/f
adding a/aa/g
pulling from ../r2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
A b/aa/g
  a/aa/g
R a/aa/g
R a/f