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

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

Make contrib/buildrpm work on Fedora 9....
Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.
Benoit Boissinot - - Load All Authors

File last commit:

r7058:9e6d6568 default
r7277:3e000e2b default
Show More
test-convert-bzr-merges
37 lines | 854 B | text/plain | TextLexer
/ tests / test-convert-bzr-merges
History | Source | Raw |Copy content |Copy permalink
Marek Kubica
convert: add bzr source
 r7053 #!/bin/sh
Benoit Boissinot
`source` doesn't work for some /bin/sh, use `.` instead
 r7058 . "$TESTDIR/bzr-definitions"
Marek Kubica
convert: add bzr source
 r7053
echo % test multiple merges at once
mkdir test-multimerge
cd test-multimerge
bzr init -q source
cd source
echo content > file
bzr add -q file
bzr commit -q -m 'Initial add'
cd ..
bzr branch -q source source-branch1
cd source-branch1
echo morecontent >> file
echo evenmorecontent > file-branch1
bzr add -q file-branch1
bzr commit -q -m 'Added branch1 file'
cd ../source
echo content > file-parent
bzr add -q file-parent
bzr commit -q -m 'Added parent file'
cd ..
bzr branch -q source source-branch2
cd source-branch2
echo somecontent > file-branch2
bzr add -q file-branch2
bzr commit -q -m 'Added brach2 file'
cd ../source
bzr merge -q ../source-branch1
bzr merge -q --force ../source-branch2
bzr commit -q -m 'Merged branches'
cd ..
hg convert --datesort source source-hg
glog -R source-hg
manifest source-hg tip