Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-unrelated-pull.out @ 1700:e2f91e0acbb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Mon, 06 Feb 2006 17:32:06 -0600
parents 9344f5dd4488
children 7544700fd931
line wrap: on
line source

pulling from ../a
searching for changes
warning: pulling from an unrelated repository!
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)
changeset:   1:9a79c33a9db3
tag:         tip
user:        a
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     a

changeset:   0:01f8062b2de5
user:        b
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     b