Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6 @ 2353:0c0bfea3f72a
Pass filename to decoder for 'hg archive' (fixes issue267)
Despite writing to a file descriptor, the check in the
[decode] section needs a filename.
localrepo.wwrite() still writes to the file descriptor.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 31 May 2006 19:41:01 +0200 |
parents | e506c14382fd |
children | ad3d5b4367cb |
line wrap: on
line source
#!/bin/sh cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge HGMERGE=./merge; export HGMERGE mkdir A1 cd A1 hg init echo This is file foo1 > foo echo This is file bar1 > bar hg add foo bar hg commit -m "commit text" -d "1000000 0" cd .. hg clone A1 B1 cd A1 rm bar hg remove bar hg commit -m "commit test" -d "1000000 0" cd ../B1 echo This is file foo22 > foo hg commit -m "commit test" -d "1000000 0" cd .. hg clone A1 A2 hg clone B1 B2 cd A1 hg pull ../B1 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. hg manifest cd ../B2 hg pull ../A2 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. hg manifest