Mercurial > hg
view tests/test-convert-clonebranches @ 8564:6b9ec23b09fc
named branches: improve pre-push logic (issue736)
Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.
Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Sat, 23 May 2009 17:04:31 +0200 |
parents | 1fe6f365df2e |
children | bb5ea66789e3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "hgext.convert = " >> $HGRCPATH echo "[convert]" >> $HGRCPATH echo "hg.tagsbranch=0" >> $HGRCPATH hg init source cd source echo a > a hg ci -qAm adda # Add a merge with one parent in the same branch echo a >> a hg ci -qAm changea hg up -qC 0 hg branch branch0 echo b > b hg ci -qAm addb hg up -qC hg merge default hg ci -qm mergeab hg tag -ql mergeab cd .. # Miss perl... sometimes cat > filter.py <<EOF import sys, re r = re.compile(r'^(?:\d+|pulling from)') sys.stdout.writelines([l for l in sys.stdin if r.search(l)]) EOF echo % convert hg convert -v --config convert.hg.clonebranches=1 source dest | python filter.py # Add a merge with both parents and child in different branches cd source hg branch branch1 echo a > file1 hg ci -qAm c1 hg up -qC mergeab hg branch branch2 echo a > file2 hg ci -qAm c2 hg merge branch1 hg branch branch3 hg ci -qAm c3 cd .. echo % incremental conversion hg convert -v --config convert.hg.clonebranches=1 source dest | python filter.py