mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
201a17ca37
Reviewed By: quark-zju Differential Revision: D19673900 fbshipit-source-id: cfdc985716aec23335eeddef517855be65505576
124 lines
3.6 KiB
Perl
124 lines
3.6 KiB
Perl
#chg-compatible
|
|
|
|
Set up test environment.
|
|
$ configure mutation-norecord
|
|
$ enable amend directaccess histedit rebase
|
|
Test that amend --to option
|
|
$ newrepo repo
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "$1"
|
|
> }
|
|
$ mkcommit "ROOT"
|
|
$ hg phase --public "desc(ROOT)"
|
|
$ mkcommit "SIDE"
|
|
$ hg phase --public "desc(SIDE)"
|
|
$ hg update -r "desc(ROOT)"
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkcommit "A"
|
|
$ mkcommit "B"
|
|
$ mkcommit "C"
|
|
Test
|
|
----
|
|
|
|
$ hg log -G -vp -T "{desc} {node|short}"
|
|
@ C a8df460dbbfediff -r c473644ee0e9 -r a8df460dbbfe C
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/C Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +C
|
|
|
|
|
o B c473644ee0e9diff -r 2a34000d3544 -r c473644ee0e9 B
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/B Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +B
|
|
|
|
|
o A 2a34000d3544diff -r ea207398892e -r 2a34000d3544 A
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/A Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +A
|
|
|
|
|
| o SIDE 3c489f4f07a6diff -r ea207398892e -r 3c489f4f07a6 SIDE
|
|
|/ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/SIDE Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +SIDE
|
|
|
|
|
o ROOT ea207398892ediff -r 000000000000 -r ea207398892e ROOT
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/ROOT Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -0,0 +1,1 @@
|
|
+ROOT
|
|
|
|
$ cat > testFile << EOF
|
|
> line1
|
|
> line2
|
|
> line3
|
|
> EOF
|
|
$ hg add testFile
|
|
$ hg amend --to dorito
|
|
abort: revision 'dorito' cannot be found
|
|
[255]
|
|
$ hg amend --to c473644
|
|
$ hg amend --to 3c489f4f07a6
|
|
abort: revision '3c489f4f07a6' is not a parent of the working copy
|
|
[255]
|
|
$ hg amend --to 'children(ea207398892e)'
|
|
abort: 'children(ea207398892e)' refers to multiple changesets
|
|
[255]
|
|
$ hg amend --to 'min(children(ea207398892e))'
|
|
abort: revision 'min(children(ea207398892e))' is not a parent of the working copy
|
|
[255]
|
|
$ hg log -G -vp -T "{desc} {node|short}"
|
|
@ C 86de924a3b95diff -r ce91eb673f02 -r 86de924a3b95 C
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/C Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +C
|
|
|
|
|
o B ce91eb673f02diff -r 2a34000d3544 -r ce91eb673f02 B
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/B Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +B
|
|
| diff -r 2a34000d3544 -r ce91eb673f02 testFile
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/testFile Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,3 @@
|
|
| +line1
|
|
| +line2
|
|
| +line3
|
|
|
|
|
o A 2a34000d3544diff -r ea207398892e -r 2a34000d3544 A
|
|
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/A Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +A
|
|
|
|
|
| o SIDE 3c489f4f07a6diff -r ea207398892e -r 3c489f4f07a6 SIDE
|
|
|/ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
| +++ b/SIDE Thu Jan 01 00:00:00 1970 +0000
|
|
| @@ -0,0 +1,1 @@
|
|
| +SIDE
|
|
|
|
|
o ROOT ea207398892ediff -r 000000000000 -r ea207398892e ROOT
|
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/ROOT Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -0,0 +1,1 @@
|
|
+ROOT
|
|
|
|
$ hg status
|
|
$ echo "line4" >> testFile
|
|
$ hg ci -m "line4"
|
|
$ echo "line5" >> testFile
|
|
$ hg amend --to ce91eb673f02
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
merging testFile
|
|
warning: 1 conflicts while merging testFile! (edit, then use 'hg resolve --mark')
|
|
amend --to encountered an issue - use hg histedit to continue or abortFix up the change (roll 8a18ce6b4d69)
|
|
(hg histedit --continue to resume)
|
|
[1]
|