Patchwork [08,of,10] tests: make rebase tests more specific

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 12, 2014, 4:08 p.m.
Message ID <ebe2b7bef0ff9e3b831e.1389542886@localhost.localdomain>
Download mbox | patch
Permalink /patch/3302/
State Superseded
Headers show

Comments

Mads Kiilerich - Jan. 12, 2014, 4:08 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1385430963 -3600
#      Tue Nov 26 02:56:03 2013 +0100
# Node ID ebe2b7bef0ff9e3b831e5784954bce7a7d76fb21
# Parent  770c4cb0644a1347264f57b7a74e46fd04d59037
tests: make rebase tests more specific

Don't rely on rebase picking other tip-most branch head when there is more than
one other branch head.

Patch

diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -52,7 +52,7 @@  Rebasing B onto H and collapsing changes
 
   $ hg phase --force --secret 3
 
-  $ hg rebase --collapse --keepbranches
+  $ hg rebase --collapse --keepbranches --dest tip
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglogp
@@ -87,7 +87,7 @@  Rebasing E onto H:
   $ cd a2
 
   $ hg phase --force --secret 6
-  $ hg rebase --source 4 --collapse
+  $ hg rebase --source 4 --dest tip --collapse
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog
@@ -123,7 +123,7 @@  Rebasing G onto H with custom message:
   abort: message can only be specified with collapse
   [255]
 
-  $ hg rebase --source 4 --collapse -m 'custom message'
+  $ hg rebase --source 4 --dest . --collapse -m 'custom message'
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
 
   $ hg tglog