view tests/test-merge6.out @ 682:d6723636c172

Revert hgeditor md5sum change

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Revert hgeditor md5sum change

My copy of md5sum doesn't do --status

manifest hash 509a316ca72aca095c590fb120eb2ee8260814dd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFC01pKywK+sNU5EO8RAkDWAJ0dWHz3Vp5oR2be9k3d1Km2Br53xgCgrBLF
Ja2tOYCu/nP4sh3CsOsIO78=
=zHkj
-----END PGP SIGNATURE-----

+ 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