[PATCH] tests: unify test-issue1306
Adrian Buehlmann
adrian at cadifra.com
Sun Sep 5 15:58:03 CDT 2010
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283719944 -7200
# Node ID a30fad100b82890ff84cae73cbc794fdcd000cad
# Parent 3d8fca45c1db175d7f6ddcc10462ad3be76ee76e
tests: unify test-issue1306
diff --git a/tests/test-issue1306.out b/tests/test-issue1306.out
deleted file mode 100644
--- a/tests/test-issue1306.out
+++ /dev/null
@@ -1,64 +0,0 @@
-% initialize remote repo with branches
-adding a
-marked working directory as branch br
-adding c
-changeset: 2:1630aed6ed2b
-branch: br
-tag: tip
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: c
-
-changeset: 1:234f53e6c5ff
-branch: br
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: b
-
-changeset: 0:cb9a9f314b8b
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: a
-
-% try cloning -r branch
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 2 changes to 2 files
-updating to branch br
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-changeset: 2:1630aed6ed2b
-branch: br
-tag: tip
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: c
-
-% try cloning -rother clone#branch
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 2 changes to 2 files
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-changeset: 0:cb9a9f314b8b
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: a
-
-% try cloning -r1 clone#branch
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 2 changes to 2 files
-updating to branch br
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-changeset: 1:234f53e6c5ff
-branch: br
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: b
-
diff --git a/tests/test-issue1306 b/tests/test-issue1306.t
old mode 100755
new mode 100644
rename from tests/test-issue1306
rename to tests/test-issue1306.t
--- a/tests/test-issue1306
+++ b/tests/test-issue1306.t
@@ -1,25 +1,98 @@
-#!/bin/sh
+# http://mercurial.selenic.com/bts/issue1306
-echo % initialize remote repo with branches
-hg init remote
-cd remote
-echo a > a
-hg ci -Ama
-hg branch br
-hg ci -Amb
-echo c > c
-hg ci -Amc
-hg log
+Initialize remote repo with branches:
-cd ..
-echo % try cloning -r branch
-hg clone -rbr remote local1
-hg -R local1 parents
+ $ hg init remote
+ $ cd remote
-echo % try cloning -rother clone#branch
-hg clone -r0 remote#br local2
-hg -R local2 parents
+ $ echo a > a
+ $ hg ci -Ama
+ adding a
-echo % try cloning -r1 clone#branch
-hg clone -r1 remote#br local3
-hg -R local3 parents
+ $ hg branch br
+ marked working directory as branch br
+ $ hg ci -Amb
+
+ $ echo c > c
+ $ hg ci -Amc
+ adding c
+
+ $ hg log
+ changeset: 2:1630aed6ed2b
+ branch: br
+ tag: tip
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: c
+
+ changeset: 1:234f53e6c5ff
+ branch: br
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: b
+
+ changeset: 0:cb9a9f314b8b
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: a
+
+
+ $ cd ..
+
+Try cloning -r branch:
+
+ $ hg clone -rbr remote local1
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 2 changes to 2 files
+ updating to branch br
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg -R local1 parents
+ changeset: 2:1630aed6ed2b
+ branch: br
+ tag: tip
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: c
+
+
+Try cloning -rother clone#branch:
+
+ $ hg clone -r0 remote#br local2
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 2 changes to 2 files
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg -R local2 parents
+ changeset: 0:cb9a9f314b8b
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: a
+
+
+Try cloning -r1 clone#branch:
+
+ $ hg clone -r1 remote#br local3
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 2 changes to 2 files
+ updating to branch br
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg -R local3 parents
+ changeset: 1:234f53e6c5ff
+ branch: br
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: b
+
+
More information about the Mercurial-devel
mailing list