This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7968

tests: move non-collapse test out of test-rebase-collapse
ClosedPublic

Authored by martinvonz on Jan 22 2020, 12:07 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG45ec64d93b3a: tests: move non-collapse test out of test-rebase-collapse
Summary

The test case was added in 76630fbbf4fa (test-rebase-collapse: Add
test for rebase regression introduced in 12309c09d19a, 2012-01-23). I
think hg rebase --collapse was involved in either the regression or
in the fix that caused the regression, but the test that was added
doesn't use --collapse, so it doesn't seem to belong in
test-rebase-collapse.t. The test case is about copies, so I moved it
to test-rebase-rename.t.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-collapse.t (55 lines)
Mtests/test-rebase-rename.t (56 lines)

Diff 19534

tests/test-rebase-collapse.t

| o 1: 1ba175478953 'B' one | o 1: 1ba175478953 'B' one
|/ |/
o 0: 1994f17a630e 'A' o 0: 1994f17a630e 'A'
$ hg rebase --keepbranches --collapse -s 1 -d 3 $ hg rebase --keepbranches --collapse -s 1 -d 3
abort: cannot collapse multiple named branches abort: cannot collapse multiple named branches
[255] [255]
$ repeatchange() {
> hg checkout $1
> hg cp d z
> echo blah >> z
> hg commit -Am "$2" --user "$3"
> }
$ repeatchange 3 "E" "user1"
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ repeatchange 3 "E" "user2"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
$ hg tglog
@ 5: fbfb97b1089a 'E'
|
| o 4: f338eb3c2c7c 'E'
|/
o 3: 41acb9dca9eb 'D'
|
| o 2: 8ac4a08debf1 'C' two
| |
| o 1: 1ba175478953 'B' one
|/
o 0: 1994f17a630e 'A'
$ hg rebase -s 5 -d 4
rebasing 5:fbfb97b1089a "E" (tip)
note: not rebasing 5:fbfb97b1089a "E" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg
$ hg tglog
@ 4: f338eb3c2c7c 'E'
|
o 3: 41acb9dca9eb 'D'
|
| o 2: 8ac4a08debf1 'C' two
| |
| o 1: 1ba175478953 'B' one
|/
o 0: 1994f17a630e 'A'
$ hg export tip
# HG changeset patch
# User user1
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213
# Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09
E
diff -r 41acb9dca9eb -r f338eb3c2c7c z
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/z Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+d
+blah
$ cd .. $ cd ..
Rebase, collapse and copies Rebase, collapse and copies
$ hg init copies $ hg init copies
$ cd copies $ cd copies
$ hg unbundle "$TESTDIR/bundles/renames.hg" $ hg unbundle "$TESTDIR/bundles/renames.hg"
adding changesets adding changesets

tests/test-rebase-rename.t

files-: a files-: a
extra: branch=default extra: branch=default
extra: rebase_source=73a3ee40125d6f0f347082e5831ceccb3f005f8a extra: rebase_source=73a3ee40125d6f0f347082e5831ceccb3f005f8a
description: description:
rename A rename A
$ repeatchange() {
> hg checkout $1
> hg cp a z
> echo blah >> z
> hg commit -Am "$2" --user "$3"
> }
$ repeatchange 1 "E" "user1"
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
created new head
$ repeatchange 1 "E" "user2"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
$ hg tglog
@ 5: af8ad1f97097 'E'
|
| o 4: 60f545c27784 'E'
|/
| o 3: 032a9b75e83b 'rename A'
| |
| o 2: 220d0626d185 'rename B'
|/
o 1: 3ab5da9a5c01 'B'
|
o 0: 1994f17a630e 'A'
$ hg rebase -s 5 -d 4
rebasing 5:af8ad1f97097 "E" (tip)
note: not rebasing 5:af8ad1f97097 "E" (tip), its destination already has all its changes
saved backup bundle to $TESTTMP/a/.hg/strip-backup/af8ad1f97097-c3e90708-rebase.hg
$ hg tglog
@ 4: 60f545c27784 'E'
|
| o 3: 032a9b75e83b 'rename A'
| |
| o 2: 220d0626d185 'rename B'
|/
o 1: 3ab5da9a5c01 'B'
|
o 0: 1994f17a630e 'A'
$ hg export tip
# HG changeset patch
# User user1
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID 60f545c277846e6bad309919bae3ae106f59cb39
# Parent 3ab5da9a5c01faa02c20f2ec4870a4f689c92da6
E
diff -r 3ab5da9a5c01 -r 60f545c27784 z
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/z Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+a
+blah
$ cd .. $ cd ..
$ hg init b $ hg init b
$ cd b $ cd b
$ echo a > a $ echo a > a
$ hg ci -Am A $ hg ci -Am A