diff -r d5adce52cef4 -r 98941c28f3e2 tests/test-amend.t --- a/tests/test-amend.t Wed Mar 21 16:06:17 2018 +0100 +++ b/tests/test-amend.t Wed Mar 21 16:18:31 2018 +0100 @@ -19,21 +19,23 @@ marked working directory as branch foo (branches are permanent and global, did you want a bookmark?) $ hg amend -d '0 0' -n "this a note on the obsmarker and supported for hg>=4.4" + current hg version does not support storing note in obsmarker $ hg debugobsolete 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) + b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob) + $ hg obslog - @ 6a022cbb61d5 (1) adda + @ 6a022cbb61d5 (2) adda | x 07f494440405 (0) adda - rewritten(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000) - note: this a note on the obsmarker and supported for hg>=4.4 + rewritten(branch) as 6a022cbb61d5 by test (Thu Jan 01 00:00:00 1970 +0000) $ hg branch foo $ hg branches - foo 1:6a022cbb61d5 + foo 2:6a022cbb61d5 $ glog - @ 1@foo(draft) adda + @ 2@foo(draft) adda Test no-op @@ -41,7 +43,7 @@ nothing changed [1] $ glog - @ 1@foo(draft) adda + @ 2@foo(draft) adda Test forcing the message to the same value, no intermediate revision. @@ -50,7 +52,7 @@ nothing changed [1] $ glog - @ 1@foo(draft) adda + @ 2@foo(draft) adda Test collapsing into an existing revision, no intermediate revision. @@ -72,19 +74,20 @@ $ hg ci -m reseta $ hg debugobsolete 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob) + b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob) $ hg phase 2 2: draft $ glog - @ 3@foo(draft) reseta + @ 4@foo(draft) reseta | - o 2@foo(draft) changea + o 3@foo(draft) changea | - o 1@foo(draft) adda + o 2@foo(draft) adda Specify precise commit date with -d $ hg amend -d '2001-02-03 04:05:06 +0700' $ hg parents --template '{rev} {date|date}\n' - 4 Sat Feb 03 04:05:06 2001 +0700 + 5 Sat Feb 03 04:05:06 2001 +0700 Specify "now" as commit date with -D $ before=`date +%s` @@ -93,13 +96,13 @@ $ after=`date +%s` $ (echo $before ; echo $commit; echo $after) | sort -k1 -n -s \d+ (re) - \d+ 0 rev5 (re) + \d+ 0 rev6 (re) \d+ (re) Specify current user as committer with -U $ HGUSER=newbie hg amend -U $ hg parents --template '{rev} {author}\n' - 6 newbie + 7 newbie Check that --logfile works $ echo "logfile message" > logfile.txt @@ -114,7 +117,7 @@ (use 'hg config --edit' to set your username) [255] $ hg sum - parent: 7:* tip (glob) + parent: 8:* tip (glob) logfile message branch: foo commit: 1 unknown (clean)