2005-06-22 07:06:17 +04:00
|
|
|
pulling from ../test1
|
|
|
|
requesting all changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
2005-07-27 07:23:59 +04:00
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 2 changes to 2 files
|
2005-06-22 07:06:17 +04:00
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
pulling from ../test2
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
2005-07-27 07:23:59 +04:00
|
|
|
adding file changes
|
2005-08-25 06:19:35 +04:00
|
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
2005-06-22 07:06:17 +04:00
|
|
|
(run 'hg update' to get a working copy)
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 2:b833d578451e
|
2005-06-22 07:06:17 +04:00
|
|
|
tag: tip
|
2006-03-13 15:05:41 +03:00
|
|
|
parent: 0:4536b1c2ca69
|
2005-06-22 07:06:17 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-22 07:06:17 +04:00
|
|
|
summary: chmod +x a
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:a187cb361a5a
|
2005-06-22 07:06:17 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-22 07:06:17 +04:00
|
|
|
summary: a updated
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 2:b833d578451e
|
2005-06-22 07:06:17 +04:00
|
|
|
tag: tip
|
2006-03-13 15:05:41 +03:00
|
|
|
parent: 0:4536b1c2ca69
|
2005-06-22 07:06:17 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-22 07:06:17 +04:00
|
|
|
summary: chmod +x a
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:a187cb361a5a
|
2005-06-22 07:06:17 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-22 07:06:17 +04:00
|
|
|
summary: a updated
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 0:4536b1c2ca69
|
2005-06-22 07:06:17 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-22 07:06:17 +04:00
|
|
|
summary: added a b
|
|
|
|
|
|
|
|
resolving manifests
|
|
|
|
merging a
|
|
|
|
resolving a
|
2006-03-13 10:56:59 +03:00
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2005-06-27 09:41:28 +04:00
|
|
|
-rwxr-x---
|
|
|
|
-rwxr-x---
|