##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Remove references to 'cloning by hardlink' from tests....
Remove references to 'cloning by hardlink' from tests. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d Remove references to 'cloning by hardlink' from tests.
Andrew Thompson - - Load All Authors

File last commit:

r676:32f7dc81 default
r676:32f7dc81 default
Show More
test-merge6.out
53 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-merge6.out
History | Annotation | Raw |Copy content |Copy permalink
+ 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