Mercurial Mercurial > hg / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-qrefresh.t
changeset 22521 3f948469bac0
parent 22519 c87f2a5a6e49
child 23172 e955549cd045
equal deleted inserted replaced
22520:9d4ebb75de53 22521:3f948469bac0 
    47   -base
 
    47   -base
 
    48   +patched
 
    48   +patched
 
    49 
    49 
    50   $ cat .hg/patches/mqbase
 
    50   $ cat .hg/patches/mqbase
 
    51   # HG changeset patch
 
    51   # HG changeset patch
 
    52   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
    52   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
    53   mqbase
 
    53   mqbase
 
    54   
    54   
    55   diff -r e7af5904b465 1/base
 
    55   diff -r e7af5904b465 1/base
 
    56   --- a/1/base
 
    56   --- a/1/base
 
    57   +++ b/1/base
 
    57   +++ b/1/base
 
    96   -base
 
    96   -base
 
    97   +patched
 
    97   +patched
 
    98 
    98 
    99   $ cat .hg/patches/mqbase
 
    99   $ cat .hg/patches/mqbase
 
   100   # HG changeset patch
 
   100   # HG changeset patch
 
   101   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   101   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   102   mqbase
 
   102   mqbase
 
   103   
   103   
   104   diff -r e7af5904b465 1/base
 
   104   diff -r e7af5904b465 1/base
 
   105   --- a/1/base
 
   105   --- a/1/base
 
   106   +++ b/1/base
 
   106   +++ b/1/base
 
   140   -base
 
   140   -base
 
   141   +patched
 
   141   +patched
 
   142 
   142 
   143   $ cat .hg/patches/mqbase
 
   143   $ cat .hg/patches/mqbase
 
   144   # HG changeset patch
 
   144   # HG changeset patch
 
   145   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   145   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   146   mqbase
 
   146   mqbase
 
   147   
   147   
   148   diff -r e7af5904b465 1/base
 
   148   diff -r e7af5904b465 1/base
 
   149   --- a/1/base
 
   149   --- a/1/base
 
   150   +++ b/1/base
 
   150   +++ b/1/base
 
   184   -base
 
   184   -base
 
   185   +patched
 
   185   +patched
 
   186 
   186 
   187   $ cat .hg/patches/mqbase
 
   187   $ cat .hg/patches/mqbase
 
   188   # HG changeset patch
 
   188   # HG changeset patch
 
   189   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   189   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   190   mqbase
 
   190   mqbase
 
   191   
   191   
   192   diff -r e7af5904b465 1/base
 
   192   diff -r e7af5904b465 1/base
 
   193   --- a/1/base
 
   193   --- a/1/base
 
   194   +++ b/1/base
 
   194   +++ b/1/base
 
   232   @@ -0,0 +1,1 @@
 
   232   @@ -0,0 +1,1 @@
 
   233   +orphan
 
   233   +orphan
 
   234 
   234 
   235   $ cat .hg/patches/mqbase
 
   235   $ cat .hg/patches/mqbase
 
   236   # HG changeset patch
 
   236   # HG changeset patch
 
   237   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   237   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   238   mqbase
 
   238   mqbase
 
   239   
   239   
   240   diff -r e7af5904b465 1/base
 
   240   diff -r e7af5904b465 1/base
 
   241   --- a/1/base
 
   241   --- a/1/base
 
   242   +++ b/1/base
 
   242   +++ b/1/base
 
   265 
   265 
   266 Before starting exclusive tests:
 
   266 Before starting exclusive tests:
 
   267 
   267 
   268   $ cat .hg/patches/mqbase
 
   268   $ cat .hg/patches/mqbase
 
   269   # HG changeset patch
 
   269   # HG changeset patch
 
   270   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   270   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   271   mqbase
 
   271   mqbase
 
   272   
   272   
   273   diff -r e7af5904b465 1/base
 
   273   diff -r e7af5904b465 1/base
 
   274   --- a/1/base
 
   274   --- a/1/base
 
   275   +++ b/1/base
 
   275   +++ b/1/base
 
   287 
   287 
   288   $ hg qref -s -X 2/base
 
   288   $ hg qref -s -X 2/base
 
   289 
   289 
   290   $ cat .hg/patches/mqbase
 
   290   $ cat .hg/patches/mqbase
 
   291   # HG changeset patch
 
   291   # HG changeset patch
 
   292   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   292   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   293   mqbase
 
   293   mqbase
 
   294   
   294   
   295   diff -r e7af5904b465 1/base
 
   295   diff -r e7af5904b465 1/base
 
   296   --- a/1/base
 
   296   --- a/1/base
 
   297   +++ b/1/base
 
   297   +++ b/1/base
 
   310 
   310 
   311   $ hg qref -s -X orphanchild -X 1/base 2/base orphanchild
 
   311   $ hg qref -s -X orphanchild -X 1/base 2/base orphanchild
 
   312 
   312 
   313   $ cat .hg/patches/mqbase
 
   313   $ cat .hg/patches/mqbase
 
   314   # HG changeset patch
 
   314   # HG changeset patch
 
   315   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   315   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   316   mqbase
 
   316   mqbase
 
   317   
   317   
   318   diff -r e7af5904b465 2/base
 
   318   diff -r e7af5904b465 2/base
 
   319   --- a/2/base
 
   319   --- a/2/base
 
   320   +++ b/2/base
 
   320   +++ b/2/base
 
   326 
   326 
   327   $ hg qref -s -I 1/ o* */*
 
   327   $ hg qref -s -I 1/ o* */*
 
   328 
   328 
   329   $ cat .hg/patches/mqbase
 
   329   $ cat .hg/patches/mqbase
 
   330   # HG changeset patch
 
   330   # HG changeset patch
 
   331   # Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   331   # Parent  e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
 
   332   mqbase
 
   332   mqbase
 
   333   
   333   
   334   diff -r e7af5904b465 1/base
 
   334   diff -r e7af5904b465 1/base
 
   335   --- a/1/base
 
   335   --- a/1/base
 
   336   +++ b/1/base
 
   336   +++ b/1/base
 
   451   b
 
   451   b
 
   452   b
 
   452   b
 
   453 
   453 
   454   $ cat .hg/patches/patch
 
   454   $ cat .hg/patches/patch
 
   455   # HG changeset patch
 
   455   # HG changeset patch
 
   456   # Parent 1a60229be7ac3e4a7f647508e99b87bef1f03593
 
   456   # Parent  1a60229be7ac3e4a7f647508e99b87bef1f03593
 
   457   
   457   
   458   diff -r 1a60229be7ac b
 
   458   diff -r 1a60229be7ac b
 
   459   --- a/b
 
   459   --- a/b
 
   460   +++ b/b
 
   460   +++ b/b
 
   461   @@ -1,1 +1,2 @@
 
   461   @@ -1,1 +1,2 @@
 
   505   abort: username 'foo\nbar' contains a newline!
 
   505   abort: username 'foo\nbar' contains a newline!
 
   506   [255]
 
   506   [255]
 
   507   $ rm a
 
   507   $ rm a
 
   508   $ cat .hg/patches/a
 
   508   $ cat .hg/patches/a
 
   509   # HG changeset patch
 
   509   # HG changeset patch
 
   510   # Parent 0000000000000000000000000000000000000000
 
   510   # Parent  0000000000000000000000000000000000000000
 
   511   
   511   
   512   diff --git a/a b/a
 
   512   diff --git a/a b/a
 
   513   new file mode 100644
 
   513   new file mode 100644
 
   514   $ hg qpush
 
   514   $ hg qpush
 
   515   applying a
 
   515   applying a
 
   520   refresh interrupted while patch was popped! (revert --all, qpush to recover)
 
   520   refresh interrupted while patch was popped! (revert --all, qpush to recover)
 
   521   abort: empty username!
 
   521   abort: empty username!
 
   522   [255]
 
   522   [255]
 
   523   $ cat .hg/patches/a
 
   523   $ cat .hg/patches/a
 
   524   # HG changeset patch
 
   524   # HG changeset patch
 
   525   # Parent 0000000000000000000000000000000000000000
 
   525   # Parent  0000000000000000000000000000000000000000
 
   526   
   526   
   527   diff --git a/a b/a
 
   527   diff --git a/a b/a
 
   528   new file mode 100644
 
   528   new file mode 100644
 
   529   $ cd ..
 
   529   $ cd ..
 
   530 
   530
Mercurial