Mercurial > hg-stable
diff tests/test-mq-qrefresh.t @ 23048:ee5f834077be stable
merge default into stable for 3.2 freeze
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Oct 2014 18:04:31 -0500 |
parents | 3f948469bac0 |
children | e955549cd045 |
line wrap: on
line diff
--- a/tests/test-mq-qrefresh.t Fri Oct 10 11:38:00 2014 -0500 +++ b/tests/test-mq-qrefresh.t Sat Oct 18 18:04:31 2014 -0500 @@ -49,7 +49,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -98,7 +98,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -142,7 +142,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -186,7 +186,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -234,7 +234,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -267,7 +267,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -289,7 +289,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -312,7 +312,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 2/base @@ -328,7 +328,7 @@ $ cat .hg/patches/mqbase # HG changeset patch - # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa + # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa mqbase diff -r e7af5904b465 1/base @@ -453,7 +453,7 @@ $ cat .hg/patches/patch # HG changeset patch - # Parent 1a60229be7ac3e4a7f647508e99b87bef1f03593 + # Parent 1a60229be7ac3e4a7f647508e99b87bef1f03593 diff -r 1a60229be7ac b --- a/b @@ -507,7 +507,8 @@ $ rm a $ cat .hg/patches/a # HG changeset patch - # Parent 0000000000000000000000000000000000000000 + # Parent 0000000000000000000000000000000000000000 + diff --git a/a b/a new file mode 100644 $ hg qpush @@ -521,7 +522,8 @@ [255] $ cat .hg/patches/a # HG changeset patch - # Parent 0000000000000000000000000000000000000000 + # Parent 0000000000000000000000000000000000000000 + diff --git a/a b/a new file mode 100644 $ cd ..