[PATCH 1 of 7] tests: have a more elaborated test for _destrebase
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Sun Feb 14 02:16:23 UTC 2016
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1455058040 0
# Tue Feb 09 22:47:20 2016 +0000
# Node ID 74d3c50ba5053ead3315818eaee03bc106e2ef8f
# Parent 420968ffb55af1f9182f86da25793920c934c208
# EXP-Topic destination
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
# hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r 74d3c50ba505
tests: have a more elaborated test for _destrebase
The previous repo had a single lineage and a single head, pretty boring for
rebase related testing.
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -760,14 +760,71 @@ Test that rebase is not confused by $CWD
rebasing 2:779a07b1b7a0 "first source commit"
rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob)
Test experimental revset
+========================
$ cd ..
+
+Make the repo a bit more interresting
+
+ $ hg up 1
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ echo aaa > aaa
+ $ hg add aaa
+ $ hg commit -m aaa
+ created new head
+ $ hg log -G
+ @ changeset: 4:5f7bc9025ed2
+ | tag: tip
+ | parent: 1:58d79cc1cf43
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: aaa
+ |
+ | o changeset: 3:1910d5ff34ea
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: second source with subdir
+ | |
+ | o changeset: 2:82901330b6ef
+ |/ user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: first source commit
+ |
+ o changeset: 1:58d79cc1cf43
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: dest commit
+ |
+ o changeset: 0:e94b687f7da3
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: initial commit
+
+
+Testing from lower head
+
+ $ hg up 3
+ 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -r '_destrebase()'
- changeset: 3:1910d5ff34ea
+ changeset: 4:5f7bc9025ed2
tag: tip
+ parent: 1:58d79cc1cf43
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- summary: second source with subdir
+ summary: aaa
+
+Testing from upper head
+
+ $ hg up 4
+ 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ hg log -r '_destrebase()'
+ changeset: 4:5f7bc9025ed2
+ tag: tip
+ parent: 1:58d79cc1cf43
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: aaa
+
More information about the Mercurial-devel
mailing list