[PATCH 1 of 3 V2] tests: demonstrate broken rebase from obsolete commit
Martin von Zweigbergk
martinvonz at google.com
Sat Mar 11 07:28:52 UTC 2017
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1485969524 28800
# Wed Feb 01 09:18:44 2017 -0800
# Node ID caaa335929a21db85735f6f12fc1c6a3c81f5e86
# Parent 5a31565161fb65056f9a062ec3d8fa81e1646328
tests: demonstrate broken rebase from obsolete commit
This shows the bug I reported in issue 5219.
diff -r 5a31565161fb -r caaa335929a2 tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t Wed Mar 01 16:19:41 2017 -0800
+++ b/tests/test-rebase-obsolete.t Wed Feb 01 09:18:44 2017 -0800
@@ -175,7 +175,7 @@
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob)
-More complex case were part of the rebase set were already rebased
+More complex case where part of the rebase set were already rebased
$ hg rebase --rev 'desc(D)' --dest 'desc(H)'
rebasing 9:08483444fef9 "D"
@@ -272,6 +272,19 @@
D
+Start rebase from a commit that is obsolete but not hidden only because it's
+a working copy parent. We should be moved back to the starting commit as usual
+even though it is hidden (until we're moved there).
+
+ $ hg --hidden up -qr 'first(hidden())'
+ $ hg rebase --rev 13 --dest 15
+ rebasing 13:98f6af4ee953 "C"
+ transaction abort!
+ rollback completed
+ abort: hidden revision '1'!
+ (use --hidden to access hidden revisions)
+ [255]
+
$ cd ..
collapse rebase
More information about the Mercurial-devel
mailing list