История изменений
Исправление xterro, (текущая версия) :
Немного консольной магии, следи за руками:
[kirill@localhost ~]$ cd test/
[kirill@localhost test]$ mkdir p1
[kirill@localhost test]$ mkdir p2
[kirill@localhost test]$ cd p1/
[kirill@localhost p1]$ touch test.txt
[kirill@localhost p1]$ hg init
[kirill@localhost p1]$ hg add .
добавляю test.txt
[kirill@localhost p1]$ hg commit -m "1"
test.txt
зафиксирован набор изменений 0:c7059d623b2e
[kirill@localhost p1]$ cd ../p2/
[kirill@localhost p2]$ cd ..
[kirill@localhost test]$ hg clone p1/ p2
updating to branch default
resolving manifests
getting test.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[kirill@localhost test]$ cd p2/
[kirill@localhost p2]$ hg st
[kirill@localhost p2]$ echo "TEST" > test.txt
[kirill@localhost p2]$ hg st
M test.txt
[kirill@localhost p2]$ hg commit -m "1"
test.txt
зафиксирован набор изменений 1:94b89c81b61a
[kirill@localhost p2]$ hg st
[kirill@localhost p2]$ cd ../p1
[kirill@localhost p1]$ hg pull -u ../p2
подтягивая из ../p2
searching for changes
all local heads known remotely
1 changesets found
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
resolving manifests
getting test.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[kirill@localhost p1]$ hg st
[kirill@localhost p1]$
[kirill@localhost p1]$ hg status --rev 1:94b89c81b61a
[kirill@localhost p1]$ hg status --rev 94b89c81b61a
[kirill@localhost p1]$ hg status --rev 1
[kirill@localhost p1]$ hg tip
changeset: 1:94b89c81b61a
tag: tip
user: xxxxxxx <olkir@bk.ru>
date: Mon Jan 28 21:24:35 2013 +0600
files: test.txt
description:
1
[kirill@localhost p1]$ hg log
changeset: 1:94b89c81b61a
tag: tip
user: xxxxxxx <olkir@bk.ru>
date: Mon Jan 28 21:24:35 2013 +0600
files: test.txt
description:
1
changeset: 0:c7059d623b2e
user: xxxxxxx <olkir@bk.ru>
date: Mon Jan 28 21:20:55 2013 +0600
files: test.txt
description:
1
Думаю вот, может у меня версия какая-нибудь не такая(2.0), или попробовать с Git-ом...
Исправление xterro, :
Немного консольной магии, следи за руками:
[kirill@localhost ~]$ cd test/
[kirill@localhost test]$ mkdir p1
[kirill@localhost test]$ mkdir p2
[kirill@localhost test]$ cd p1/
[kirill@localhost p1]$ touch test.txt
[kirill@localhost p1]$ hg init
[kirill@localhost p1]$ hg add .
добавляю test.txt
[kirill@localhost p1]$ hg commit -m "1"
test.txt
зафиксирован набор изменений 0:c7059d623b2e
[kirill@localhost p1]$ cd ../p2/
[kirill@localhost p2]$ cd ..
[kirill@localhost test]$ hg clone p1/ p2
updating to branch default
resolving manifests
getting test.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[kirill@localhost test]$ cd p2/
[kirill@localhost p2]$ hg st
[kirill@localhost p2]$ echo "TEST" > test.txt
[kirill@localhost p2]$ hg st
M test.txt
[kirill@localhost p2]$ hg commit -m "1"
test.txt
зафиксирован набор изменений 1:94b89c81b61a
[kirill@localhost p2]$ hg st
[kirill@localhost p2]$ cd ../p1
[kirill@localhost p1]$ hg pull -u ../p2
подтягивая из ../p2
searching for changes
all local heads known remotely
1 changesets found
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
resolving manifests
getting test.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[kirill@localhost p1]$ hg st
[kirill@localhost p1]$
[kirill@localhost p1]$ hg status --rev 1:94b89c81b61a
[kirill@localhost p1]$ hg status --rev 94b89c81b61a
[kirill@localhost p1]$ hg status --rev 1
[kirill@localhost p1]$ hg tip
changeset: 1:94b89c81b61a
tag: tip
user: Olifiro Kirill <olkir@bk.ru>
date: Mon Jan 28 21:24:35 2013 +0600
files: test.txt
description:
1
[kirill@localhost p1]$ hg log
changeset: 1:94b89c81b61a
tag: tip
user: xxxxxxx <olkir@bk.ru>
date: Mon Jan 28 21:24:35 2013 +0600
files: test.txt
description:
1
changeset: 0:c7059d623b2e
user: xxxxxxx <olkir@bk.ru>
date: Mon Jan 28 21:20:55 2013 +0600
files: test.txt
description:
1
Думаю вот, может у меня версия какая-нибудь не такая(2.0), или попробовать с Git-ом...
Исходная версия xterro, :
Немного консольной магии, следи за руками:
[kirill@localhost ~]$ cd test/
[kirill@localhost test]$ mkdir p1
[kirill@localhost test]$ mkdir p2
[kirill@localhost test]$ cd p1/
[kirill@localhost p1]$ touch test.txt
[kirill@localhost p1]$ hg init
[kirill@localhost p1]$ hg add .
добавляю test.txt
[kirill@localhost p1]$ hg commit -m "1"
test.txt
зафиксирован набор изменений 0:c7059d623b2e
[kirill@localhost p1]$ cd ../p2/
[kirill@localhost p2]$ cd ..
[kirill@localhost test]$ hg clone p1/ p2
updating to branch default
resolving manifests
getting test.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[kirill@localhost test]$ cd p2/
[kirill@localhost p2]$ hg st
[kirill@localhost p2]$ echo "TEST" > test.txt
[kirill@localhost p2]$ hg st
M test.txt
[kirill@localhost p2]$ hg commit -m "1"
test.txt
зафиксирован набор изменений 1:94b89c81b61a
[kirill@localhost p2]$ hg st
[kirill@localhost p2]$ cd ../p1
[kirill@localhost p1]$ hg pull -u ../p2
подтягивая из ../p2
searching for changes
all local heads known remotely
1 changesets found
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
resolving manifests
getting test.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[kirill@localhost p1]$ hg st
[kirill@localhost p1]$
[kirill@localhost p1]$ hg status --rev 1:94b89c81b61a
[kirill@localhost p1]$ hg status --rev 94b89c81b61a
[kirill@localhost p1]$ hg status --rev 1
[kirill@localhost p1]$ hg tip
changeset: 1:94b89c81b61a
tag: tip
user: Olifiro Kirill <olkir@bk.ru>
date: Mon Jan 28 21:24:35 2013 +0600
files: test.txt
description:
1
[kirill@localhost p1]$ hg log
changeset: 1:94b89c81b61a
tag: tip
user: Olifiro Kirill <olkir@bk.ru>
date: Mon Jan 28 21:24:35 2013 +0600
files: test.txt
description:
1
changeset: 0:c7059d623b2e
user: Olifiro Kirill <olkir@bk.ru>
date: Mon Jan 28 21:20:55 2013 +0600
files: test.txt
description:
1
Думаю вот, может у меня версия какая-нибудь не такая(2.0), или попробовать с Git-ом...