Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-unrelated-pull.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:10 -0600
changeset 1701 4ba8fe499df2
parent 1043 9344f5dd4488
child 1933 7544700fd931
permissions -rw-r--r--
hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

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
mercurial-crew-with-dirclash