|
|
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 to branch default
|
|
|
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 to branch default
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
comparing with b
|
|
|
searching for changes
|
|
|
changeset: 4:119caaef4ed1
|
|
|
tag: tip
|
|
|
parent: 1:79f9e10cd04e
|
|
|
parent: 2:8e1bb01c1a24
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: m2
|
|
|
|
|
|
comparing with c
|
|
|
searching for changes
|
|
|
changeset: 3:cbb48b367d1b
|
|
|
parent: 2:8e1bb01c1a24
|
|
|
parent: 1:79f9e10cd04e
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: m1
|
|
|
|
|
|
comparing with c
|
|
|
searching for changes
|
|
|
changeset: 3:cbb48b367d1b
|
|
|
tag: tip
|
|
|
parent: 2:8e1bb01c1a24
|
|
|
parent: 1:79f9e10cd04e
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
summary: m1
|
|
|
|
|
|
comparing with b
|
|
|
searching for changes
|
|
|
changeset: 3:119caaef4ed1
|
|
|
tag: tip
|
|
|
parent: 1:79f9e10cd04e
|
|
|
parent: 2:8e1bb01c1a24
|
|
|
user: test
|
|
|
date: Thu Jan 01 00:00:00 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)
|
|
|
|
