sapling/tests/test-flags.t

150 lines
3.8 KiB
Perl
Raw Normal View History

2010-08-12 14:10:57 +04:00
$ umask 027
$ mkdir test1
$ cd test1
$ hg init
$ touch a b
$ hg add a b
$ hg ci -m "added a b"
2010-08-12 14:10:57 +04:00
$ cd ..
$ hg clone test1 test3
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkdir test2
$ cd test2
$ hg init
$ 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"
2010-08-12 14:10:57 +04:00
the changelog should mention file a:
$ hg tip --template '{files}\n'
a
$ cd ../test1
$ echo 123 >>a
$ hg ci -m "a updated"
2010-08-12 14:10:57 +04:00
$ 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
2010-08-12 14:10:57 +04:00
tag: tip
parent: 0:22a449e20da5
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: chmod +x a
changeset: 1:c6ecefc45368
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: a updated
$ hg history
changeset: 2:7f4313b42a34
2010-08-12 14:10:57 +04:00
tag: tip
parent: 0:22a449e20da5
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: chmod +x a
changeset: 1:c6ecefc45368
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: a updated
changeset: 0:22a449e20da5
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
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"
2010-08-12 14:10:57 +04:00
$ 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
2010-08-12 14:10:57 +04:00
tag: tip
parent: 0:22a449e20da5
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: chmod +x a
changeset: 1:dc57ead75f79
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: b updated
$ hg history
changeset: 2:7f4313b42a34
2010-08-12 14:10:57 +04:00
tag: tip
parent: 0:22a449e20da5
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: chmod +x a
changeset: 1:dc57ead75f79
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
summary: b updated
changeset: 0:22a449e20da5
2010-08-12 14:10:57 +04:00
user: test
date: Thu Jan 01 00:00:00 1970 +0000
2010-08-12 14:10:57 +04:00
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 .hg/store/data/a.i
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
$ hg debugindex ../test2/.hg/store/data/a.i
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
$ hg debugindex ../test1/.hg/store/data/a.i
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000