view tests/test-rename-dir-merge2.out @ 7370:7bc62ebe7693

graphlog: refactor common grapher code Extracts the column and edge determination code into a separate function usable on generic DAGs with at most 2 parents per node. grapher() is very similar to graphmod.graph(). I shall look into merging them when I try visualizing patch branches in hgweb. Started using contexts and renamed a bunch of variables (fewer underscores).
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Fri, 14 Nov 2008 13:44:10 +0100
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