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

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

document and fix findincoming...
document and fix findincoming - add documentation about what the function does, notably the fact that it updates 'base' - transform the workflow to a more simple 'if elif elif else' - do not call remote.branches if not necessary - some nodes where missing in 'base' (from what I understand, if the root of a branch is missing but one parent is present, the parent should be in 'base') - add a testcase for an incorrect outgoing that is fixed by this cset - add a testcase for an empty group bug, it needs fixing
Vadim Gelfer - - Load All Authors

File last commit:

r2283:e506c143 default
r2339:11422943 default
Show More
test-merge6
46 lines | 708 B | text/plain | TextLexer
/ tests / test-merge6
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
 r800 #!/bin/sh
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cat <<'EOF' > merge
#!/bin/sh
echo merging for `basename $1`
EOF
chmod +x merge
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
 r800 HGMERGE=./merge; export HGMERGE
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
mkdir A1
cd A1
hg init
echo This is file foo1 > foo
echo This is file bar1 > bar
hg add foo bar
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit text" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ..
hg clone A1 B1
cd A1
rm bar
hg remove bar
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ../B1
echo This is file foo22 > foo
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616
cd ..
hg clone A1 A2
hg clone B1 B2
cd A1
hg pull ../B1
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
 r2283 hg merge
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616 echo bar should remain deleted.
hg manifest
cd ../B2
hg pull ../A2
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
 r2283 hg merge
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "commit test" -d "1000000 0"
maf46@burn.cl.cam.ac.uk
Fix zombie files in merge...
 r616 echo bar should remain deleted.
hg manifest