Mercurial > hg > pyhgsh

view tests/test-merge6.out @ 1319:5a15df632e6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix behaviour of commit. It's now a fatal error if the option to --logfile isn't readable. Ditto if both --message and --logfile are specified.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 22 Sep 2005 21:42:33 -0700
parents 9344f5dd4488
children ced2d3620f95
line wrap: on
line source

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