mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
62b3015c0d
# HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab # Parent 0bda45294416406d4c6fbaf1cb643dd0bf6b3a16 Remove references to 'cloning by hardlink' from tests.
54 lines
1.2 KiB
Plaintext
54 lines
1.2 KiB
Plaintext
+ cat
|
|
+ chmod +x merge
|
|
+ export HGMERGE=./merge
|
|
+ HGMERGE=./merge
|
|
+ mkdir A1
|
|
+ cd A1
|
|
+ hg init
|
|
+ echo This is file foo1
|
|
+ echo This is file bar1
|
|
+ hg add foo bar
|
|
+ hg commit -t 'commit text' -d '0 0' -u user
|
|
+ cd ..
|
|
+ hg clone A1 B1
|
|
+ cd A1
|
|
+ rm bar
|
|
+ hg remove bar
|
|
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
+ cd ../B1
|
|
+ echo This is file foo22
|
|
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
+ cd ..
|
|
+ hg clone A1 A2
|
|
+ hg clone B1 B2
|
|
+ cd A1
|
|
+ hg pull ../B1
|
|
pulling from ../B1
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file revisions
|
|
modified 1 files, added 1 changesets and 1 new revisions
|
|
(run 'hg update' to get a working copy)
|
|
+ hg update -m
|
|
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
+ echo bar should remain deleted.
|
|
bar should remain deleted.
|
|
+ hg manifest
|
|
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
|
|
+ cd ../B2
|
|
+ hg pull ../A2
|
|
pulling from ../A2
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file revisions
|
|
modified 0 files, added 1 changesets and 0 new revisions
|
|
(run 'hg update' to get a working copy)
|
|
+ hg update -m
|
|
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
+ echo bar should remain deleted.
|
|
bar should remain deleted.
|
|
+ hg manifest
|
|
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
|