Mercurial > evolve
comparison tests/test-evolve-content-divergent-corner-cases.t @ 5627:ce6f570918fd mercurial-5.5
tests: back out changeset 3b7df91c2ba7
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 31 Oct 2020 18:06:07 +0800 |
| parents | 3b7df91c2ba7 |
| children | eed42a183d46 552efcc2cc30 |
comparison
equal
deleted
inserted
replaced
| 5626:aea931d59fc0 | 5627:ce6f570918fd |
|---|---|
| 234 o 0:135f39f4bd78@default(draft) add _a [] | 234 o 0:135f39f4bd78@default(draft) add _a [] |
| 235 | 235 |
| 236 | 236 |
| 237 $ cat >$TESTTMP/test_extension.py << EOF | 237 $ cat >$TESTTMP/test_extension.py << EOF |
| 238 > from mercurial import merge | 238 > from mercurial import merge |
| 239 > origupdate = merge._update | 239 > origupdate = merge.update |
| 240 > def newupdate(*args, **kwargs): | 240 > def newupdate(*args, **kwargs): |
| 241 > return origupdate(*args, **kwargs) | 241 > return origupdate(*args, **kwargs) |
| 242 > merge._update = newupdate | 242 > merge.update = newupdate |
| 243 > EOF | 243 > EOF |
| 244 $ cat >> $HGRCPATH << EOF | 244 $ cat >> $HGRCPATH << EOF |
| 245 > [extensions] | 245 > [extensions] |
| 246 > testextension=$TESTTMP/test_extension.py | 246 > testextension=$TESTTMP/test_extension.py |
| 247 > EOF | 247 > EOF |