Mercurial > evolve
comparison tests/test-amend.t @ 5304:83ceafbaa7d6 stable
branching: merge into stable in preparation for release
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 08 May 2020 18:22:26 +0800 |
parents | e8660b28bfee |
children | e8542915d0f7 65d4e47d7f26 |
comparison
equal
deleted
inserted
replaced
5252:a828c7a7ace1 | 5304:83ceafbaa7d6 |
---|---|
19 marked working directory as branch foo | 19 marked working directory as branch foo |
20 (branches are permanent and global, did you want a bookmark?) | 20 (branches are permanent and global, did you want a bookmark?) |
21 $ hg amend -d '0 0' -n "this a note on the obsmarker and supported for hg>=4.4" | 21 $ hg amend -d '0 0' -n "this a note on the obsmarker and supported for hg>=4.4" |
22 $ hg debugobsolete | 22 $ hg debugobsolete |
23 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) | 23 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
24 $ hg obslog | 24 $ hg obslog --no-origin |
25 @ 6a022cbb61d5 (1) adda | 25 @ 6a022cbb61d5 (1) adda |
26 | | 26 | |
27 x 07f494440405 (0) adda | 27 x 07f494440405 (0) adda |
28 branch-changed(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 28 branch-changed(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
29 note: this a note on the obsmarker and supported for hg>=4.4 | 29 note: this a note on the obsmarker and supported for hg>=4.4 |
30 | |
31 $ hg obslog | |
32 @ 6a022cbb61d5 (1) adda | |
33 | branch-changed(branch) from 07f494440405 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | |
34 | note: this a note on the obsmarker and supported for hg>=4.4 | |
35 | | |
36 x 07f494440405 (0) adda | |
30 | 37 |
31 $ hg branch | 38 $ hg branch |
32 foo | 39 foo |
33 $ hg branches | 40 $ hg branches |
34 foo 1:6a022cbb61d5 | 41 foo 1:6a022cbb61d5 |