Mercurial Mercurial > hg / annotate
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-branchmap.out
author Greg Ward <greg-hg@gerg.ca>
Mon, 15 Feb 2010 15:25:29 -0500
branchstable
changeset 10505 b3311e26f94f
parent 9879 7bb004fc14ec
child 10546 3a69afd6987e
permissions -rw-r--r--
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9671
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     1
 
marked working directory as branch æ
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     2
 
adding foo
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     3
 
listening at http://localhost/ (bound to 127.0.0.1)
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     4
 
requesting all changes
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     5
 
adding changesets
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     6
 
adding manifests
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     7
 
adding file changes
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
     8
 
added 1 changesets with 1 changes to 1 files
9787
b1dad6b4dfae Make test-branchmap executable and adjust output after a3d73b3e1f8a
Thomas Arendsen Hein <thomas@intevation.de>
parents: 9671
diff changeset 
     9
 
updating to branch æ
9671
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    10
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    11
 
changeset:   0:867c11ce77b8
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    12
 
branch:      æ
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    13
 
tag:         tip
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    14
 
user:        test
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    15
 
date:        Thu Jan 01 00:00:00 1970 +0000
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    16
 
summary:     foo
9471d9a900b4 transfer branchmap branch names over the wire in utf-8
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset 
    17
 












9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    18


pushing to http://localhost:PORT













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    19


searching for changes













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    20


adding changesets













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    21


adding manifests













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    22


adding file changes













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    23


added 1 changesets with 1 changes to 1 files













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    24


changeset:   1:58e7c90d67cb













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    25


branch:      æ













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    26


tag:         tip













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    27


user:        test













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    28


date:        Thu Jan 01 00:00:00 1970 +0000













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    29


summary:     bar













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    30














9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    31


changeset:   0:867c11ce77b8













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    32


branch:      æ













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    33


user:        test













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    34


date:        Thu Jan 01 00:00:00 1970 +0000













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    35


summary:     foo













9471d9a900b4
transfer branchmap branch names over the wire in utf-8



Henrik Stuart <henrik.stuart@edlund.dk>


parents: 

diff
changeset




    36









9879






7bb004fc14ec
Extend test-branchmap to test c51494c53841



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
9787

diff
changeset




    37


pushing to ssh://dummy/













7bb004fc14ec
Extend test-branchmap to test c51494c53841



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
9787

diff
changeset




    38


searching for changes













7bb004fc14ec
Extend test-branchmap to test c51494c53841



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
9787

diff
changeset




    39


remote: adding changesets













7bb004fc14ec
Extend test-branchmap to test c51494c53841



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
9787

diff
changeset




    40


remote: adding manifests













7bb004fc14ec
Extend test-branchmap to test c51494c53841



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
9787

diff
changeset




    41


remote: adding file changes













7bb004fc14ec
Extend test-branchmap to test c51494c53841



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
9787

diff
changeset




    42


remote: added 1 changesets with 1 changes to 1 files















Mercurial