equal
deleted
inserted
replaced
124 cd ../../b |
124 cd ../../b |
125 echo x>x |
125 echo x>x |
126 hg ci -Ama |
126 hg ci -Ama |
127 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
127 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
128 hg unbundle .hg/strip-backup/* |
128 hg unbundle .hg/strip-backup/* |
|
129 |
|
130 cat >>$HGTMP/.hgrc <<EOF |
|
131 [diff] |
|
132 git = True |
|
133 EOF |
|
134 cd .. |
|
135 hg init git |
|
136 cd git |
|
137 hg qinit |
|
138 |
|
139 hg qnew -m'new file' new |
|
140 echo foo > new |
|
141 chmod +x new |
|
142 hg add new |
|
143 hg qrefresh |
|
144 sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/new |
|
145 |
|
146 hg qnew -m'copy file' copy |
|
147 hg cp new copy |
|
148 hg qrefresh |
|
149 sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/copy |
|
150 |
|
151 hg qpop |
|
152 hg qpush |
|
153 hg qdiff |