tests/test-mq-qpush-exact.t
author Gregory Szorc <gregory.szorc@gmail.com>
Wed, 07 Feb 2018 20:24:22 -0800
changeset 36069 957e773614d0
parent 26780 bbf544b5f2e9
permissions -rw-r--r--
wireprotoserver: rename _client to client (API) This method is called in wireproto.py. It should be part of the public API/interface. .. api:: The ``_client()`` method of the wire protocol handler interface has been renamed to ``client()``. Differential Revision: https://phab.mercurial-scm.org/D2084
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     1
  $ echo "[extensions]" >> $HGRCPATH
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     2
  $ echo "mq=" >> $HGRCPATH
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     3
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     4
make a test repository that looks like this:
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     5
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     6
o    2:28bc7b1afd6a
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     7
|
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     8
| @  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
     9
|/
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    10
o    0/62ecad8b70e5
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    11
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    12
  $ hg init r0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    13
  $ cd r0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    14
  $ touch f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    15
  $ hg ci -m0 -Aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    16
  $ touch f1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    17
  $ hg ci -m1 -Aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    18
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    19
  $ hg update 0 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    20
  $ touch f2
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    21
  $ hg ci -m2 -Aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    22
  $ hg update 1 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    23
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    24
make some patches with a parent: 1:d7fe2034f71b -> p0 -> p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    25
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    26
  $ echo cp0 >> fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    27
  $ hg add fp0
14170
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    28
  $ hg ci -m p0 -d "0 0"
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    29
  $ hg export -r. > p0
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    30
  $ hg strip -qn .
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    31
  $ hg qimport p0
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    32
  adding p0 to series file
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    33
  $ hg qpush
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    34
  applying p0
31ec4d7eb63f mq: strip extra whitespace from node ids in header (issue2790)
Kevin Bullock <kbullock@ringworld.org>
parents: 13033
diff changeset
    35
  now at: p0
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    36
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    37
  $ echo cp1 >> fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    38
  $ hg add fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    39
  $ hg qnew p1 -d "0 0"
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    40
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    41
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    42
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    43
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    44
qpush --exact when at the parent
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    45
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    46
  $ hg update 1 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    47
  $ hg qpush -e
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    48
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    49
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    50
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    51
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    52
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    53
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    54
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    55
  $ hg qpush -e p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    56
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    57
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    58
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    59
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    60
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    61
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    62
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    63
  $ hg qpush -e p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    64
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    65
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    66
  now at: p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    67
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    68
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    69
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    70
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    71
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    72
qpush --exact when at another rev
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    73
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    74
  $ hg update 0 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    75
  $ hg qpush -e
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    76
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    77
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    78
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    79
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    80
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    81
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    82
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    83
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    84
  $ hg update 0 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    85
  $ hg qpush -e p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    86
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    87
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    88
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    89
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    90
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    91
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    92
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    93
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    94
  $ hg update 0 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    95
  $ hg qpush -e p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    96
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    97
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    98
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
    99
  now at: p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   100
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   101
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   102
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   103
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   104
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   105
  $ hg update 0 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   106
  $ hg qpush -ea
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   107
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   108
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   109
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   110
  now at: p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   111
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   112
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   113
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   114
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   115
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   116
qpush --exact while crossing branches
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   117
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   118
  $ hg update 2 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   119
  $ hg qpush -e
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   120
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   121
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   122
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   123
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   124
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   125
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   126
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   127
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   128
  $ hg update 2 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   129
  $ hg qpush -e p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   130
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   131
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   132
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   133
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   134
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   135
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   136
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   137
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   138
  $ hg update 2 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   139
  $ hg qpush -e p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   140
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   141
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   142
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   143
  now at: p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   144
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   145
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   146
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   147
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   148
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   149
  $ hg update 2 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   150
  $ hg qpush -ea
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   151
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   152
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   153
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   154
  now at: p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   155
  $ hg parents -qr qbase
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   156
  1:d7fe2034f71b
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   157
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   158
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   159
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   160
qpush --exact --force with changes to an unpatched file
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   161
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   162
  $ hg update 1 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   163
  $ echo c0 >> f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   164
  $ hg qpush -e
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14256
diff changeset
   165
  abort: local changes found
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14256
diff changeset
   166
  [255]
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   167
  $ hg qpush -ef
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   168
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   169
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   170
  $ cat f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   171
  c0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   172
  $ rm f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   173
  $ touch f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   174
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   175
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   176
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   177
  $ hg update 1 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   178
  $ echo c0 >> f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   179
  $ hg qpush -e p1
14732
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14256
diff changeset
   180
  abort: local changes found
e9ed3506f066 backout of d04ba50e104d: allow to qpop/push with a dirty working copy
Idan Kamara <idankk86@gmail.com>
parents: 14256
diff changeset
   181
  [255]
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   182
  $ hg qpush -e p1 -f
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   183
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   184
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   185
  now at: p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   186
  $ cat f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   187
  c0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   188
  $ rm f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   189
  $ touch f0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   190
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   191
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   192
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   193
qpush --exact --force with changes to a patched file
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   194
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   195
  $ hg update 1 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   196
  $ echo cp0-bad >> fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   197
  $ hg add fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   198
  $ hg qpush -e
14191
e1c34ce39fae mq: don't suggest to refresh when qpushing with no applied patches
Idan Kamara <idankk86@gmail.com>
parents: 14170
diff changeset
   199
  abort: local changes found
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   200
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   201
  $ hg qpush -ef
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   202
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   203
  file fp0 already exists
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   204
  1 out of 1 hunks FAILED -- saving rejects to file fp0.rej
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   205
  patch failed, unable to continue (try -v)
24365
f1eaf03dd608 commands: say "working directory" in full spelling
Yuya Nishihara <yuya@tcha.org>
parents: 20117
diff changeset
   206
  patch failed, rejects left in working directory
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 24365
diff changeset
   207
  errors during apply, please fix and qrefresh p0
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   208
  [2]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   209
  $ cat fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   210
  cp0-bad
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   211
  $ cat fp0.rej
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   212
  --- fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   213
  +++ fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   214
  @@ -0,0 +1,1 @@
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   215
  +cp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   216
  $ hg qpop -aqf
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   217
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   218
  $ rm fp0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   219
  $ rm fp0.rej
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   220
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   221
  $ hg update 1 -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   222
  $ echo cp1-bad >> fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   223
  $ hg add fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   224
  $ hg qpush -e p1
14191
e1c34ce39fae mq: don't suggest to refresh when qpushing with no applied patches
Idan Kamara <idankk86@gmail.com>
parents: 14170
diff changeset
   225
  abort: local changes found
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   226
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   227
  $ hg qpush -e p1 -f
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   228
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   229
  applying p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   230
  file fp1 already exists
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   231
  1 out of 1 hunks FAILED -- saving rejects to file fp1.rej
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   232
  patch failed, unable to continue (try -v)
24365
f1eaf03dd608 commands: say "working directory" in full spelling
Yuya Nishihara <yuya@tcha.org>
parents: 20117
diff changeset
   233
  patch failed, rejects left in working directory
26780
bbf544b5f2e9 mq: consistently use qrefresh
timeless@mozdev.org
parents: 24365
diff changeset
   234
  errors during apply, please fix and qrefresh p1
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   235
  [2]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   236
  $ cat fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   237
  cp1-bad
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   238
  $ cat fp1.rej
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   239
  --- fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   240
  +++ fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   241
  @@ -0,0 +1,1 @@
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   242
  +cp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   243
  $ hg qpop -aqf
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   244
  patch queue now empty
19929
ab2362e1672e merge: exit early during a no-op update (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
   245
  $ hg forget fp1
13033
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   246
  $ rm fp1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   247
  $ rm fp1.rej
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   248
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   249
qpush --exact when already at a patch
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   250
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   251
  $ hg update 1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   252
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   253
  $ hg qpush -e p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   254
  applying p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   255
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   256
  $ hg qpush -e p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   257
  abort: cannot push --exact with applied patches
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   258
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   259
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   260
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   261
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   262
qpush --exact --move should fail
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   263
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   264
  $ hg qpush -e --move p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   265
  abort: cannot use --exact and --move together
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   266
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   267
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   268
qpush --exact a patch without a parent recorded
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   269
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   270
  $ hg qpush -q
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   271
  now at: p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   272
  $ grep -v '# Parent' .hg/patches/p0 > p0.new
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   273
  $ mv p0.new .hg/patches/p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   274
  $ hg qpop -aq
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   275
  patch queue now empty
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   276
  $ hg qpush -e
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   277
  abort: p0 does not have a parent recorded
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   278
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   279
  $ hg qpush -e p0
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   280
  abort: p0 does not have a parent recorded
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   281
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   282
  $ hg qpush -e p1
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   283
  abort: p0 does not have a parent recorded
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   284
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   285
  $ hg qpush -ea
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   286
  abort: p0 does not have a parent recorded
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   287
  [255]
026053f691a4 mq: add an '-e/--exact' option to qpush
Steve Losh <steve@stevelosh.com>
parents:
diff changeset
   288
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14732
diff changeset
   289
  $ cd ..