tests/test-backout.t
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Mon, 30 Aug 2010 18:47:02 +0900
changeset 12121 8f258dd4ed02
parent 11856 db969ebdebd9
child 12316 4134686b83e1
permissions -rw-r--r--
tests: unify test-rebuildstate
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     1
  $ HGMERGE=true; export HGMERGE
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     3
  $ hg init basic
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     4
  $ cd basic
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     5
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     6
# should complain
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2614
diff changeset
     7
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     8
  $ hg backout
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
     9
  abort: please specify a revision to backout
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    10
  $ hg backout -r 0 0
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    11
  abort: please specify just one revision
4726
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
    12
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    13
# basic operation
4726
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
    14
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    15
  $ echo a > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    16
  $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    17
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    18
  $ echo b >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    19
  $ hg commit -d '1 0' -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    20
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    21
  $ hg backout -d '2 0' tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    22
  reverting a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    23
  changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    24
  $ cat a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    25
  a
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    26
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    27
# file that was removed is recreated
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    28
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    29
  $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    30
  $ hg init remove
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    31
  $ cd remove
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    32
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    33
  $ echo content > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    34
  $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    35
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    36
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    37
  $ hg rm a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    38
  $ hg commit -d '1 0' -m b
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    39
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    40
  $ hg backout -d '2 0' --merge tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    41
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    42
  changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    43
  $ cat a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    44
  content
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    45
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    46
# backout of backout is as if nothing happened
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    47
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    48
  $ hg backout -d '3 0' --merge tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    49
  removing a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    50
  changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    51
  $ cat a 2>/dev/null || echo cat: a: No such file or directory
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    52
  cat: a: No such file or directory
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    53
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    54
# across branch
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    55
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    56
  $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    57
  $ hg init branch
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    58
  $ cd branch
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    59
  $ echo a > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    60
  $ hg ci -Am0
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    61
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    62
  $ echo b > b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    63
  $ hg ci -Am1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    64
  adding b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    65
  $ hg co -C 0
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    66
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    67
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    68
should fail
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    69
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    70
  $ hg backout 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    71
  abort: cannot backout change on a different branch
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    72
  $ echo c > c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    73
  $ hg ci -Am2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    74
  adding c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    75
  created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    76
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    77
should fail
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    78
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    79
  $ hg backout 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    80
  abort: cannot backout change on a different branch
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    81
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    82
# backout with merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    83
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    84
  $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    85
  $ hg init merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    86
  $ cd merge
5568
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset
    87
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    88
  $ echo line 1 > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    89
  $ echo line 2 >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    90
  $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    91
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    92
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    93
remove line 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    94
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    95
  $ echo line 2 > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    96
  $ hg commit -d '1 0' -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    97
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    98
  $ echo line 3 >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
    99
  $ hg commit -d '2 0' -m c
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   100
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   101
  $ hg backout --merge -d '3 0' 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   102
  reverting a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   103
  created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   104
  changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   105
  merging with changeset 3:26b8ccb9ad91
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   106
  merging a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   107
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   108
  (branch merge, don't forget to commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   109
  $ hg commit -d '4 0' -m d
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   110
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   111
check line 1 is back
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   112
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   113
  $ cat a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   114
  line 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   115
  line 2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   116
  line 3
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   117
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   118
# backout should not back out subsequent changesets
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   119
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   120
  $ hg init onecs
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   121
  $ cd onecs
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   122
  $ echo 1 > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   123
  $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   124
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   125
  $ echo 2 >> a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   126
  $ hg commit -d '1 0' -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   127
  $ echo 1 > b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   128
  $ hg commit -d '2 0' -A -m c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   129
  adding b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   130
  $ hg backout -d '3 0' 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   131
  reverting a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   132
  created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   133
  changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   134
  the backout changeset is a new head - do not forget to merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   135
  (use "backout --merge" if you want to auto-merge)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   136
  $ hg locate b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   137
  b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   138
  $ hg update -C tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   139
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   140
  $ hg locate b
2492
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2186
diff changeset
   141
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   142
  $ cd ..
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   143
  $ hg init m
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   144
  $ cd m
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   145
  $ echo a > a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   146
  $ hg commit -d '0 0' -A -m a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   147
  adding a
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   148
  $ echo b > b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   149
  $ hg commit -d '1 0' -A -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   150
  adding b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   151
  $ echo c > c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   152
  $ hg commit -d '2 0' -A -m b
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   153
  adding c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   154
  $ hg update 1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   155
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   156
  $ echo d > d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   157
  $ hg commit -d '3 0' -A -m c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   158
  adding d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   159
  created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   160
  $ hg merge 2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   161
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   162
  (branch merge, don't forget to commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   163
  $ hg commit -d '4 0' -A -m d
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   164
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   165
# backout of merge should fail
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   166
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   167
  $ hg backout 4
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   168
  abort: cannot backout a merge changeset without --parent
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   169
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   170
# backout of merge with bad parent should fail
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   171
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   172
  $ hg backout --parent 0 4
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   173
  abort: cb9a9f314b8b is not a parent of b2f3bb92043e
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   174
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   175
# backout of non-merge with parent should fail
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   176
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   177
  $ hg backout --parent 0 3
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   178
  abort: cannot use --parent on non-merge changeset
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   179
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   180
# backout with valid parent should be ok
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   181
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   182
  $ hg backout -d '5 0' --parent 2 4
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   183
  removing d
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   184
  changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   185
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   186
  $ hg rollback
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   187
  rolling back to revision 4 (undo commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   188
  $ hg update -C
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   189
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2614
8ba1c31f6864 backout: allow backout of merge changeset with --parent option.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset
   190
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   191
  $ hg backout -d '6 0' --parent 3 4
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   192
  removing c
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   193
  changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   194
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   195
  $ cd ..
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   196
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   197
# named branches
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   198
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   199
  $ hg init named_branches
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   200
  $ cd named_branches
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   201
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   202
  $ echo default > default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   203
  $ hg ci -d '0 0' -Am default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   204
  adding default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   205
  $ hg branch branch1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   206
  marked working directory as branch branch1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   207
  $ echo branch1 > file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   208
  $ hg ci -d '1 0' -Am file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   209
  adding file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   210
  $ hg branch branch2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   211
  marked working directory as branch branch2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   212
  $ echo branch2 > file2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   213
  $ hg ci -d '2 0' -Am file2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   214
  adding file2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   215
  $ hg backout -d '3 0' -r 1 -m 'backout on branch1'
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   216
  removing file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   217
  created new head
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   218
  changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   219
  the backout changeset is a new head - do not forget to merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   220
  (use "backout --merge" if you want to auto-merge)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   221
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   222
XXX maybe backout shouldn't suggest a merge here as it is a different branch?
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   223
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   224
on branch2 with branch1 not merged, so file1 should still exist:
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   225
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   226
  $ hg id
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   227
  45bbcd363bf0 (branch2)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   228
  $ hg st -A
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   229
  C default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   230
  C file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   231
  C file2
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   232
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   233
on branch2 with branch1 merged, so file1 should be gone:
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   234
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   235
  $ hg merge
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   236
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   237
  (branch merge, don't forget to commit)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   238
  $ hg ci -d '4 0' -m 'merge backout of branch1'
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   239
  $ hg id
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   240
  22149cdde76d (branch2) tip
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   241
  $ hg st -A
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   242
  C default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   243
  C file2
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   244
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   245
on branch1, so no file1 and file2:
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset
   246
11856
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   247
  $ hg co -C branch1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   248
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   249
  $ hg id
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   250
  bf1602f437f3 (branch1)
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   251
  $ hg st -A
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   252
  C default
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   253
  C file1
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   254
db969ebdebd9 tests: unify test-backout
Martin Geisler <mg@lazybytes.net>
parents: 8167
diff changeset
   255
  $ exit 0