equal
deleted
inserted
replaced
127 $ bzr commit -q -m 'Initial add' |
127 $ bzr commit -q -m 'Initial add' |
128 $ cd .. |
128 $ cd .. |
129 $ bzr branch -q source source-improve |
129 $ bzr branch -q source source-improve |
130 $ cd source |
130 $ cd source |
131 $ echo more >> a |
131 $ echo more >> a |
132 $ python ../helper.py 'Editing a' 100 |
132 $ $PYTHON ../helper.py 'Editing a' 100 |
133 $ cd ../source-improve |
133 $ cd ../source-improve |
134 $ echo content3 >> b |
134 $ echo content3 >> b |
135 $ python ../helper.py 'Editing b' 200 |
135 $ $PYTHON ../helper.py 'Editing b' 200 |
136 $ cd ../source |
136 $ cd ../source |
137 $ bzr merge -q ../source-improve |
137 $ bzr merge -q ../source-improve |
138 $ bzr commit -q -m 'Merged improve branch' |
138 $ bzr commit -q -m 'Merged improve branch' |
139 $ cd .. |
139 $ cd .. |
140 $ hg convert --datesort source source-hg |
140 $ hg convert --datesort source source-hg |