mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
c8ff620c56
For filelogs, debugindex and debugdata can be called with the file name directly instead of the path to the revlog. Since in the future filelogs will no longer be valid revlogs, calling with a path to the revlog is deprecated for debugdata. For debugindex it is expected to still work, but I changed them as well for consistency.
148 lines
3.7 KiB
Raku
148 lines
3.7 KiB
Raku
$ umask 027
|
|
|
|
$ hg init test1
|
|
$ cd test1
|
|
$ touch a b
|
|
$ hg add a b
|
|
$ hg ci -m "added a b"
|
|
|
|
$ cd ..
|
|
$ hg clone test1 test3
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg init test2
|
|
$ cd test2
|
|
$ hg pull ../test1
|
|
pulling from ../test1
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
(run 'hg update' to get a working copy)
|
|
$ hg co
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ chmod +x a
|
|
$ hg ci -m "chmod +x a"
|
|
|
|
the changelog should mention file a:
|
|
|
|
$ hg tip --template '{files}\n'
|
|
a
|
|
|
|
$ cd ../test1
|
|
$ echo 123 >>a
|
|
$ hg ci -m "a updated"
|
|
|
|
$ hg pull ../test2
|
|
pulling from ../test2
|
|
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)
|
|
$ hg heads
|
|
changeset: 2:7f4313b42a34
|
|
tag: tip
|
|
parent: 0:22a449e20da5
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:c6ecefc45368
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a updated
|
|
|
|
$ hg history
|
|
changeset: 2:7f4313b42a34
|
|
tag: tip
|
|
parent: 0:22a449e20da5
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:c6ecefc45368
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: a updated
|
|
|
|
changeset: 0:22a449e20da5
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: added a b
|
|
|
|
|
|
$ hg -v merge
|
|
resolving manifests
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cd ../test3
|
|
$ echo 123 >>b
|
|
$ hg ci -m "b updated"
|
|
|
|
$ hg pull ../test2
|
|
pulling from ../test2
|
|
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)
|
|
$ hg heads
|
|
changeset: 2:7f4313b42a34
|
|
tag: tip
|
|
parent: 0:22a449e20da5
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:dc57ead75f79
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: b updated
|
|
|
|
$ hg history
|
|
changeset: 2:7f4313b42a34
|
|
tag: tip
|
|
parent: 0:22a449e20da5
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:dc57ead75f79
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: b updated
|
|
|
|
changeset: 0:22a449e20da5
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: added a b
|
|
|
|
|
|
$ hg -v merge
|
|
resolving manifests
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ ls -l ../test[123]/a > foo
|
|
$ cut -b 1-10 < foo
|
|
-rwxr-x---
|
|
-rwxr-x---
|
|
-rwxr-x---
|
|
|
|
$ hg debugindex a
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 0 0 0 b80de5d13875 000000000000 000000000000
|
|
$ hg debugindex -R ../test2 a
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 0 0 0 b80de5d13875 000000000000 000000000000
|
|
$ hg debugindex -R ../test1 a
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 0 0 0 b80de5d13875 000000000000 000000000000
|
|
1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000
|