Mercurial > hg
comparison tests/test-keyword.t @ 23621:bb679344c88d
keyword: update test file syntax
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Sun, 21 Dec 2014 12:53:57 +0000 |
| parents | 9ab18a912c44 |
| children | cb9d845406e5 |
comparison
equal
deleted
inserted
replaced
| 23620:3d4aa20b775d | 23621:bb679344c88d |
|---|---|
| 182 $ touch empty | 182 $ touch empty |
| 183 $ hg -q commit -A -m "another file" | 183 $ hg -q commit -A -m "another file" |
| 184 $ hg status -A --rev 3:4 i | 184 $ hg status -A --rev 3:4 i |
| 185 C i | 185 C i |
| 186 | 186 |
| 187 $ hg -q strip -n 2 | 187 $ hg -q strip --no-backup 2 |
| 188 | 188 |
| 189 Test hook execution | 189 Test hook execution |
| 190 | 190 |
| 191 bundle | 191 bundle |
| 192 | 192 |
| 519 $ hg -q id | 519 $ hg -q id |
| 520 67d8c481a6be | 520 67d8c481a6be |
| 521 $ head -1 a | 521 $ head -1 a |
| 522 expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $ | 522 expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $ |
| 523 | 523 |
| 524 $ hg -q strip -n tip | 524 $ hg -q strip --no-backup tip |
| 525 | 525 |
| 526 Test patch queue repo | 526 Test patch queue repo |
| 527 | 527 |
| 528 $ hg init --mq | 528 $ hg init --mq |
| 529 $ hg qimport -r tip -n mqtest.diff | 529 $ hg qimport -r tip -n mqtest.diff |
| 1062 foo | 1062 foo |
| 1063 >>>>>>> other: 85d2d2d732a5 - test: simplemerge | 1063 >>>>>>> other: 85d2d2d732a5 - test: simplemerge |
| 1064 | 1064 |
| 1065 resolve to local | 1065 resolve to local |
| 1066 | 1066 |
| 1067 $ HGMERGE=internal:local hg resolve -a | 1067 $ hg resolve -t internal:local -a |
| 1068 (no more unresolved files) | 1068 (no more unresolved files) |
| 1069 $ hg commit -m localresolve | 1069 $ hg commit -m localresolve |
| 1070 $ cat m | 1070 $ cat m |
| 1071 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ | 1071 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
| 1072 bar | 1072 bar |