mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
6554961897
Summary: This makes narrow-heads migration smoother. Reviewed By: ikostia Differential Revision: D22052478 fbshipit-source-id: 83047ad6da4de2034c917bfd5be47a2f32d5cc3d
46 lines
1.5 KiB
Perl
46 lines
1.5 KiB
Perl
#chg-compatible
|
|
|
|
$ enable amend
|
|
$ setconfig experimental.evolution=obsolete
|
|
$ setconfig experimental.narrow-heads=false
|
|
$ setconfig visibility.enabled=true
|
|
$ setconfig mutation.record=true mutation.enabled=true mutation.date="0 0"
|
|
|
|
$ newrepo
|
|
$ echo "base" > base
|
|
$ hg commit -Aqm base
|
|
$ echo 1 > file
|
|
$ hg commit -Aqm commit1
|
|
$ echo 2 > file
|
|
$ hg amend -Aqm commit1-amended
|
|
$ tglogm --hidden
|
|
@ 2: f9719601f84a 'commit1-amended'
|
|
|
|
|
| x 1: e6c779c67aa9 'commit1' (Rewritten using amend into f9719601f84a)
|
|
|/
|
|
o 0: d20a80d4def3 'base'
|
|
|
|
$ hg log -r 'successors(1)' -T '{node} {desc}\n' --hidden
|
|
e6c779c67aa947c951f334f4f312bd2b21d27e55 commit1
|
|
f9719601f84ab527273dc915bfb41704b111058c commit1-amended
|
|
$ hg log -r 'predecessors(2)' -T '{node} {desc}\n' --hidden
|
|
e6c779c67aa947c951f334f4f312bd2b21d27e55 commit1
|
|
f9719601f84ab527273dc915bfb41704b111058c commit1-amended
|
|
|
|
Set the phase of the obsolete commit to public, simulating the older version being landed.
|
|
$ hg debugmakepublic 1 --hidden
|
|
|
|
The commit should no longer show up as amended.
|
|
$ tglogm --hidden
|
|
@ 2: f9719601f84a 'commit1-amended'
|
|
|
|
|
| o 1: e6c779c67aa9 'commit1'
|
|
|/
|
|
o 0: d20a80d4def3 'base'
|
|
|
|
The predecessor and successor relationship has been removed.
|
|
$ hg log -r 'successors(1)' -T '{node} {desc}\n' --hidden
|
|
e6c779c67aa947c951f334f4f312bd2b21d27e55 commit1
|
|
$ hg log -r 'predecessors(2)' -T '{node} {desc}\n' --hidden
|
|
f9719601f84ab527273dc915bfb41704b111058c commit1-amended
|