tests/test-merge6.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 15 Feb 2006 10:49:30 -0800
changeset 1730 0f1d2c75db5e
parent 1043 9344f5dd4488
child 2019 ced2d3620f95
permissions -rw-r--r--
add prechangegroup and pretxnchangegroup hooks. prechangegroup lets you stop push, pull or unbundle before it begins. pretxnchangegroup lets you inspect changegroup before transaction is committed, and roll back if you not like it.

pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo