Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rename regression tests
authortimeless <timeless@mozdev.org>
Thu, 25 Feb 2016 16:54:14 +0000
changeset 28251 4591cd6b6794
parent 28250 6d0d11731e1c
child 28255 f75f7d39cca3
tests: rename regression tests
tests/test-1102.t file | annotate | diff | comparison | revisions
tests/test-1993.t file | annotate | diff | comparison | revisions
tests/test-586.t file | annotate | diff | comparison | revisions
tests/test-issue1102.t file | annotate | diff | comparison | revisions
tests/test-issue1993.t file | annotate | diff | comparison | revisions
tests/test-issue586.t file | annotate | diff | comparison | revisions 
--- a/tests/test-1102.t	Thu Feb 25 10:01:59 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-  $ rm -rf a
-  $ hg init a
-  $ cd a
-  $ echo a > a
-  $ hg ci -Am0
-  adding a
-  $ hg tag t1 # 1
-  $ hg tag --remove t1 # 2
-
-  $ hg co 1
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg tag -f -r0 t1
-  $ hg tags
-  tip                                3:a49829c4fc11
-  t1                                 0:f7b1eb17ad24
-
-  $ cd ..
--- a/tests/test-1993.t	Thu Feb 25 10:01:59 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-  $ hg init a
-  $ cd a
-  $ echo a > a
-  $ hg ci -Am0
-  adding a
-  $ echo b > b
-  $ hg ci -Am1
-  adding b
-  $ hg tag -r0 default
-  warning: tag default conflicts with existing branch name
-  $ hg log
-  changeset:   2:30a83d1e4a1e
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     Added tag default for changeset f7b1eb17ad24
-  
-  changeset:   1:925d80f479bb
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     1
-  
-  changeset:   0:f7b1eb17ad24
-  tag:         default
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     0
-  
-  $ hg update 'tag(default)'
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg parents
-  changeset:   0:f7b1eb17ad24
-  tag:         default
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     0
-  
-  $ hg update 'branch(default)'
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg parents
-  changeset:   2:30a83d1e4a1e
-  tag:         tip
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     Added tag default for changeset f7b1eb17ad24
-  
-
-  $ cd ..
--- a/tests/test-586.t	Thu Feb 25 10:01:59 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-Issue586: removing remote files after merge appears to corrupt the
-dirstate
-
-  $ hg init a
-  $ cd a
-  $ echo a > a
-  $ hg ci -Ama
-  adding a
-
-  $ hg init ../b
-  $ cd ../b
-  $ echo b > b
-  $ hg ci -Amb
-  adding b
-
-  $ hg pull -f ../a
-  pulling from ../a
-  searching for changes
-  warning: repository is unrelated
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  (run 'hg heads' to see heads, 'hg merge' to merge)
-  $ hg merge
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ hg rm -f a
-  $ hg ci -Amc
-
-  $ hg st -A
-  C b
-  $ cd ..
-
-Issue1433: Traceback after two unrelated pull, two move, a merge and
-a commit (related to issue586)
-
-create test repos
-
-  $ hg init repoa
-  $ touch repoa/a
-  $ hg -R repoa ci -Am adda
-  adding a
-
-  $ hg init repob
-  $ touch repob/b
-  $ hg -R repob ci -Am addb
-  adding b
-
-  $ hg init repoc
-  $ cd repoc
-  $ hg pull ../repoa
-  pulling from ../repoa
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  (run 'hg update' to get a working copy)
-  $ hg update
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ mkdir tst
-  $ hg mv * tst
-  $ hg ci -m "import a in tst"
-  $ hg pull -f ../repob
-  pulling from ../repob
-  searching for changes
-  warning: repository is unrelated
-  requesting all changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  (run 'hg heads' to see heads, 'hg merge' to merge)
-
-merge both repos
-
-  $ hg merge
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-  $ mkdir src
-
-move b content
-
-  $ hg mv b src
-  $ hg ci -m "import b in src"
-  $ hg manifest
-  src/b
-  tst/a
-
-  $ cd ..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue1102.t	Thu Feb 25 16:54:14 2016 +0000
@@ -0,0 +1,17 @@
+  $ rm -rf a
+  $ hg init a
+  $ cd a
+  $ echo a > a
+  $ hg ci -Am0
+  adding a
+  $ hg tag t1 # 1
+  $ hg tag --remove t1 # 2
+
+  $ hg co 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg tag -f -r0 t1
+  $ hg tags
+  tip                                3:a49829c4fc11
+  t1                                 0:f7b1eb17ad24
+
+  $ cd ..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue1993.t	Thu Feb 25 16:54:14 2016 +0000
@@ -0,0 +1,48 @@
+  $ hg init a
+  $ cd a
+  $ echo a > a
+  $ hg ci -Am0
+  adding a
+  $ echo b > b
+  $ hg ci -Am1
+  adding b
+  $ hg tag -r0 default
+  warning: tag default conflicts with existing branch name
+  $ hg log
+  changeset:   2:30a83d1e4a1e
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag default for changeset f7b1eb17ad24
+  
+  changeset:   1:925d80f479bb
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     1
+  
+  changeset:   0:f7b1eb17ad24
+  tag:         default
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     0
+  
+  $ hg update 'tag(default)'
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ hg parents
+  changeset:   0:f7b1eb17ad24
+  tag:         default
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     0
+  
+  $ hg update 'branch(default)'
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg parents
+  changeset:   2:30a83d1e4a1e
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag default for changeset f7b1eb17ad24
+  
+
+  $ cd ..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-issue586.t	Thu Feb 25 16:54:14 2016 +0000
@@ -0,0 +1,92 @@
+Issue586: removing remote files after merge appears to corrupt the
+dirstate
+
+  $ hg init a
+  $ cd a
+  $ echo a > a
+  $ hg ci -Ama
+  adding a
+
+  $ hg init ../b
+  $ cd ../b
+  $ echo b > b
+  $ hg ci -Amb
+  adding b
+
+  $ hg pull -f ../a
+  pulling from ../a
+  searching for changes
+  warning: repository is unrelated
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg rm -f a
+  $ hg ci -Amc
+
+  $ hg st -A
+  C b
+  $ cd ..
+
+Issue1433: Traceback after two unrelated pull, two move, a merge and
+a commit (related to issue586)
+
+create test repos
+
+  $ hg init repoa
+  $ touch repoa/a
+  $ hg -R repoa ci -Am adda
+  adding a
+
+  $ hg init repob
+  $ touch repob/b
+  $ hg -R repob ci -Am addb
+  adding b
+
+  $ hg init repoc
+  $ cd repoc
+  $ hg pull ../repoa
+  pulling from ../repoa
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files
+  (run 'hg update' to get a working copy)
+  $ hg update
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ mkdir tst
+  $ hg mv * tst
+  $ hg ci -m "import a in tst"
+  $ hg pull -f ../repob
+  pulling from ../repob
+  searching for changes
+  warning: repository is unrelated
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+
+merge both repos
+
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ mkdir src
+
+move b content
+
+  $ hg mv b src
+  $ hg ci -m "import b in src"
+  $ hg manifest
+  src/b
+  tst/a
+
+  $ cd ..
mercurial