Mercurial > evolve
comparison tests/test-touch.t @ 4727:355b8e17e14c stable
touch: add test which shows touch can fail to warn about divergence
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 29 Jun 2019 14:28:35 +0530 |
| parents | 30a544904238 |
| children | ef8907df73fc |
comparison
equal
deleted
inserted
replaced
| 4726:24e83f51ffc2 | 4727:355b8e17e14c |
|---|---|
| 168 $ hg touch 2 | 168 $ hg touch 2 |
| 169 abort: cannot touch public changesets: * (glob) | 169 abort: cannot touch public changesets: * (glob) |
| 170 (see 'hg help phases' for details) | 170 (see 'hg help phases' for details) |
| 171 [255] | 171 [255] |
| 172 $ hg touch --duplicate 2 | 172 $ hg touch --duplicate 2 |
| 173 | |
| 174 $ cd .. | |
| 175 | |
| 176 Make sure touch doesn't fail to warn about divergence (issue6107) | |
| 177 | |
| 178 $ hg init touchdiv | |
| 179 $ cd touchdiv | |
| 180 $ echo c > c | |
| 181 $ hg add c | |
| 182 $ hg ci -m "added c" | |
| 183 | |
| 184 $ hg amend -m "modified c" | |
| 185 $ hg prune . -q | |
| 186 | |
| 187 $ hg touch -r "desc('added c')" --hidden | |
| 188 $ hg touch -r "desc('modified c')" --hidden | |
| 189 2 new content-divergent changesets | |
| 190 XXX: it should warn for divergence here | |
| 191 | |
| 192 $ cd .. |