comparison tests/test-keyword.t @ 15871:07893690c435 stable

keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file Analogous to 012b285cf643.
author Christian Ebert <blacktrash@gmx.net>
date Sun, 15 Jan 2012 13:37:33 +0100
parents 41885892796e
children 933b9ff73750
comparison
equal deleted inserted replaced
15870:f4c859293ed4 15871:07893690c435
158 do not process $Id: 158 do not process $Id:
159 xxx $ 159 xxx $
160 ignore $Id$ 160 ignore $Id$
161 a 161 a
162 162
163 Test hook execution
164
165 $ diff a hooktest 163 $ diff a hooktest
166 164
167 $ cp $HGRCPATH.nohooks $HGRCPATH 165 $ cp $HGRCPATH.nohooks $HGRCPATH
168 $ rm hooktest 166 $ rm hooktest
167
168 hg status of kw-ignored binary file starting with '\1\n'
169
170 $ printf '\1\nfoo' > i
171 $ hg -q commit -Am metasep i
172 $ hg status
173 $ printf '\1\nbar' > i
174 $ hg status
175 M i
176 $ hg -q commit -m "modify metasep" i
177 $ hg status --rev 2:3
178 M i
179 $ touch empty
180 $ hg -q commit -A -m "another file"
181 $ hg status -A --rev 3:4 i
182 C i
183
184 $ hg -q strip -n 2
185
186 Test hook execution
169 187
170 bundle 188 bundle
171 189
172 $ hg bundle --base null ../kw.hg 190 $ hg bundle --base null ../kw.hg
173 2 changesets found 191 2 changesets found