sapling/tests/test-remotebranches-with-schemes.out

75 lines
2.2 KiB
Plaintext

marked working directory as branch stable
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
pulling from alpha
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
(run 'hg update' to get a working copy)
pulling from dotdot://beta
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% graph shows tags for the branch heads of each path
@ changeset: 6:ce61ec32ee23
|\ tag: tip
| | parent: 5:6d6442577283
| | parent: 4:8948da77173b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: merging stable
| |
| o changeset: 5:6d6442577283
| | parent: 3:78f83396d79e
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: add e
| |
o | changeset: 4:8948da77173b
|\| branch: stable
| | tag: beta/stable
| | parent: 2:95cb4ab9fe1d
| | parent: 3:78f83396d79e
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: merged
| |
| o changeset: 3:78f83396d79e
| | tag: beta/default
| | parent: 1:7c3bad9141dc
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: add d
| |
o | changeset: 2:95cb4ab9fe1d
|/ branch: stable
| tag: alpha/stable
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: add c
|
o changeset: 1:7c3bad9141dc
| tag: alpha/default
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: add b
|
o changeset: 0:1f0dee641bb7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a