Mercurial > evolve
comparison tests/test-metaedit.t @ 3288:b714709afe6a mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Dec 2017 18:30:14 +0100 |
| parents | 4303a46b4167 |
| children | 7a5c3175015e |
comparison
equal
deleted
inserted
replaced
| 3287:4303a46b4167 | 3288:b714709afe6a |
|---|---|
| 172 | 172 |
| 173 $ hg obslog -r . | 173 $ hg obslog -r . |
| 174 @ a08d35fd7d9d (10) E | 174 @ a08d35fd7d9d (10) E |
| 175 |\ | 175 |\ |
| 176 x | 212b2a2b87cd (9) F | 176 x | 212b2a2b87cd (9) F |
| 177 | | rewritten(description, user, parent, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000) | 177 | | rewritten(description, user, parent, content) as a08d35fd7d9d by test (*) (glob) |
| 178 | | note: folding changesets using metaedit | 178 | | note: folding changesets using metaedit |
| 179 | | | 179 | | |
| 180 | x c2bd843aa246 (7) E | 180 | x c2bd843aa246 (7) E |
| 181 | rewritten(description, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000) | 181 | rewritten(description, content) as a08d35fd7d9d by test (*) (glob) |
| 182 | note: folding changesets using metaedit | 182 | note: folding changesets using metaedit |
| 183 | | 183 | |
| 184 x 587528abfffe (8) F | 184 x 587528abfffe (8) F |
| 185 rewritten(user) as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000) | 185 rewritten(user) as 212b2a2b87cd by test (*) (glob) |
| 186 | 186 |
| 187 | 187 |
| 188 no new commit is created here because the date is the same | 188 no new commit is created here because the date is the same |
| 189 $ HGEDITOR=cat hg metaedit | 189 $ HGEDITOR=cat hg metaedit |
| 190 E | 190 E |