equal
deleted
inserted
replaced
16 Test that amend captures branches |
16 Test that amend captures branches |
17 |
17 |
18 $ hg branch foo |
18 $ hg branch foo |
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' |
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 |
|
25 @ 6a022cbb61d5 (1) adda |
|
26 | |
|
27 x 07f494440405 (0) adda |
|
28 rewritten(branch) as 6a022cbb61d5 by test (Thu Jan 01 00:00:00 1970 +0000) |
|
29 note: 'this a note on the obsmarker and supported for hg>=4.4' |
|
30 |
24 $ hg branch |
31 $ hg branch |
25 foo |
32 foo |
26 $ hg branches |
33 $ hg branches |
27 foo 1:6a022cbb61d5 |
34 foo 1:6a022cbb61d5 |
28 $ glog |
35 $ glog |
143 -e --edit invoke editor on commit messages |
150 -e --edit invoke editor on commit messages |
144 --extract extract changes from the commit to the working copy |
151 --extract extract changes from the commit to the working copy |
145 --close-branch mark a branch as closed, hiding it from the branch |
152 --close-branch mark a branch as closed, hiding it from the branch |
146 list |
153 list |
147 -s --secret use the secret phase for committing |
154 -s --secret use the secret phase for committing |
|
155 -n --note VALUE store a note on amend |
148 -I --include PATTERN [+] include names matching the given patterns |
156 -I --include PATTERN [+] include names matching the given patterns |
149 -X --exclude PATTERN [+] exclude names matching the given patterns |
157 -X --exclude PATTERN [+] exclude names matching the given patterns |
150 -m --message TEXT use text as commit message |
158 -m --message TEXT use text as commit message |
151 -l --logfile FILE read commit message from file |
159 -l --logfile FILE read commit message from file |
152 -d --date DATE record the specified date as commit date |
160 -d --date DATE record the specified date as commit date |