Mercurial > evolve
comparison tests/test-amend.t @ 2595:54ac473663ff mercurial-4.1
compat-test: merge with stable
* Blackbox format seems to have change when displaying config CLI options.
* As obsfate template is now only compatible with hg 4.2+, remove all references
to it in test files.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jun 2017 11:42:00 +0200 |
| parents | cbc7a69116bd |
| children | 70004f0847a2 |
comparison
equal
deleted
inserted
replaced
| 2531:d3d686f05458 | 2595:54ac473663ff |
|---|---|
| 19 $ hg branch foo | 19 $ hg branch foo |
| 20 marked working directory as branch foo | 20 marked working directory as branch foo |
| 21 (branches are permanent and global, did you want a bookmark?) | 21 (branches are permanent and global, did you want a bookmark?) |
| 22 $ hg amend -d '0 0' | 22 $ hg amend -d '0 0' |
| 23 $ hg debugobsolete | 23 $ hg debugobsolete |
| 24 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'user': 'test'} (glob) | 24 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 25 b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'user': 'test'} (glob) | 25 b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 26 $ hg branch | 26 $ hg branch |
| 27 foo | 27 foo |
| 28 $ hg branches | 28 $ hg branches |
| 29 foo 2:6a022cbb61d5 | 29 foo 2:6a022cbb61d5 |
| 30 $ glog | 30 $ glog |
| 64 a | 64 a |
| 65 -a | 65 -a |
| 66 $ hg pdiff | 66 $ hg pdiff |
| 67 $ hg ci -m reseta | 67 $ hg ci -m reseta |
| 68 $ hg debugobsolete | 68 $ hg debugobsolete |
| 69 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'user': 'test'} (glob) | 69 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 70 b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'user': 'test'} (glob) | 70 b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 71 $ hg phase 2 | 71 $ hg phase 2 |
| 72 2: draft | 72 2: draft |
| 73 $ glog | 73 $ glog |
| 74 @ 4@foo(draft) reseta | 74 @ 4@foo(draft) reseta |
| 75 | | 75 | |