mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
fedc819459
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----
18 lines
298 B
Bash
Executable File
18 lines
298 B
Bash
Executable File
#!/bin/bash
|
|
|
|
set -x
|
|
hg init
|
|
echo "nothing" > a
|
|
hg add a
|
|
hg commit -t ancestor -u test -d "0 0"
|
|
echo "something" > a
|
|
hg commit -t branch1 -u test -d "0 0"
|
|
hg co 0
|
|
echo "something else" > a
|
|
hg commit -t branch2 -u test -d "0 0"
|
|
export HGMERGE=merge
|
|
hg -d up -m 1
|
|
hg id
|
|
grep -Ev ">>>|<<<" a
|
|
hg status
|