view tests/test-merge4 @ 11778:7e5f5e5858f9 stable

convert: Using --dest-type svn crashed, if the source repo used tags. The convert extension requires puttags(self, tags) to return a sequence for a multi-variable assignment. If puttags implicitly returns None, the code will break when trying to un-pack None for assignment.
author Daniel J. Lauk <daniel.lauk@gmail.com>
date Wed, 11 Aug 2010 11:46:06 +0200
parents e506c14382fd
children
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"