tests/test-empty-group.out
author Jeremy Whitlock <jcscoobyrs@gmail.com>
Thu, 02 Apr 2009 18:18:43 -0600
changeset 7958 73fa2be69ea9
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
Fix how setup.py identifies the Mercurial version. There is a problem with setup.py where it will not identify the Mercurial version properly when not being ran in within a repository even if mercurial/__version__.py exists. To fix, use mercurial.__version__.version when available before defaulting to "unknown". (Using mercurial.util.version() is not an option due to a dependency issue where osutil can be referenced before it is built.)

adding init
adding x
adding y
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
adding x
adding y
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
created new head
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
updating working directory
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
updating working directory
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
comparing with b
searching for changes
changeset:   4:fdb3c546e859
tag:         tip
parent:      1:1f703b3fcbc6
parent:      2:de997049e034
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     m2

comparing with c
searching for changes
changeset:   3:f40f830c0024
parent:      2:de997049e034
parent:      1:1f703b3fcbc6
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     m1

comparing with c
searching for changes
changeset:   3:f40f830c0024
tag:         tip
parent:      2:de997049e034
parent:      1:1f703b3fcbc6
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     m1

comparing with b
searching for changes
changeset:   3:fdb3c546e859
tag:         tip
parent:      1:1f703b3fcbc6
parent:      2:de997049e034
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     m2

pulling from a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
pulling from a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)