Mercurial Mercurial > hg / annotate
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-backout.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 May 2009 17:36:24 -0500
changeset 8503 90f86a5330bb
parent 6423 fb374b1b3911
child 8779 708938509732
permissions -rw-r--r--
commit: tidy up mergestate slightly
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4726
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4718
diff changeset 
     1
 
# should complain
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4718
diff changeset 
     2
 
abort: please specify a revision to backout
f6e961c0155b Fix and test 'hg backout' without or with too many revisions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4718
diff changeset 
     3
 
abort: please specify just one revision
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
# basic operation
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
adding a
2407
8fe3d60b7f19 revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2303
diff changeset 
     6
 
reverting a
4718
934275cd4526 backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents: 4195
diff changeset 
     7
 
changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
a
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     9
 
# file that was removed is recreated
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
adding a
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
adding a
4718
934275cd4526 backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents: 4195
diff changeset 
    12
 
changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
content
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
# backout of backout is as if nothing happened
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
removing a
4718
934275cd4526 backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents: 4195
diff changeset 
    16
 
changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    17
 
cat: a: No such file or directory
5568
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    18
 
# across branch
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    19
 
adding a
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    20
 
adding b
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    21
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    22
 
abort: cannot back out change on a different branch
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    23
 
adding c
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6162
diff changeset 
    24
 
created new head
5568
de620356064f backout: disallow across branches (issue655)
Matt Mackall <mpm@selenic.com>
parents: 4726
diff changeset 
    25
 
abort: cannot back out change on a different branch
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    26
 
# backout with merge
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    27
 
adding a
2407
8fe3d60b7f19 revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2303
diff changeset 
    28
 
reverting a
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6162
diff changeset 
    29
 
created new head
6161
bc1ba9124799 Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents: 5568
diff changeset 
    30
 
changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
bc1ba9124799 Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents: 5568
diff changeset 
    31
 
merging with changeset 3:26b8ccb9ad91
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    32
 
merging a
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2158
diff changeset 
    33
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2158
diff changeset 
    34
 
(branch merge, don't forget to commit)
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    35
 
line 1
6161
bc1ba9124799 Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents: 5568
diff changeset 
    36
 
line 2
bc1ba9124799 Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents: 5568
diff changeset 
    37
 
line 3
2492
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    38
 
# backout should not back out subsequent changesets
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    39
 
adding a
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    40
 
adding b
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    41
 
reverting a
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6162
diff changeset 
    42
 
created new head
4718
934275cd4526 backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents: 4195
diff changeset 
    43
 
changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
2493
9c660e691e90 print message after backout that tells that backout adds new head.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset 
    44
 
the backout changeset is a new head - do not forget to merge
2769
2ace3bf43089 tests: fix output for test-backout
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2619
diff changeset 
    45
 
(use "backout --merge" if you want to auto-merge)
6161
bc1ba9124799 Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents: 5568
diff changeset 
    46
 
b
bc1ba9124799 Reverse the way backout is doing the merge
Gilles Moris <gilles.moris@free.fr>
parents: 5568
diff changeset 
    47
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2619
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    48
 
adding a
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    49
 
adding b
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    50
 
adding c
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    51
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    52
 
adding d
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6162
diff changeset 
    53
 
created new head
2619
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    54
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    55
 
(branch merge, don't forget to commit)
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    56
 
# backout of merge should fail
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    57
 
abort: cannot back out a merge changeset without --parent
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    58
 
# backout of merge with bad parent should fail
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    59
 
abort: cb9a9f314b8b is not a parent of b2f3bb92043e
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    60
 
# backout of non-merge with parent should fail
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    61
 
abort: cannot use --parent on non-merge changeset
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    62
 
# backout with valid parent should be ok
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    63
 
removing d
4718
934275cd4526 backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents: 4195
diff changeset 
    64
 
changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
2619
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    65
 
rolling back last transaction
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    66
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    67
 
removing c
4718
934275cd4526 backout: report short hash in commit message
Matt Mackall <mpm@selenic.com>
parents: 4195
diff changeset 
    68
 
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 
    69
 
# named branches
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    70
 
adding default
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    71
 
marked working directory as branch branch1
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    72
 
adding file1
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    73
 
marked working directory as branch branch2
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    74
 
adding file2
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    75
 
removing file1
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6162
diff changeset 
    76
 
created new head
6423
fb374b1b3911 backout: reverse changeset belongs on current branch
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    77
 
changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    78
 
the backout changeset is a new head - do not forget to merge
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    79
 
(use "backout --merge" if you want to auto-merge)
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    80
 
% on branch2 with branch1 not merged, so file1 should still exist:
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    81
 
45bbcd363bf0 (branch2)
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    82
 
C default
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    83
 
C file1
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    84
 
C file2
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    85
 
% on branch2 with branch1 merged, so file1 should be gone:
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    86
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    87
 
(branch merge, don't forget to commit)
6423
fb374b1b3911 backout: reverse changeset belongs on current branch
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    88
 
22149cdde76d (branch2) tip
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    89
 
C default
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    90
 
C file2
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    91
 
% on branch1, so no file1 and file2:
6423
fb374b1b3911 backout: reverse changeset belongs on current branch
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    92
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
fb374b1b3911 backout: reverse changeset belongs on current branch
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    93
 
bf1602f437f3 (branch1)
6162
554715e584e6 Add test case for backout on named branches (issue665)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6161
diff changeset 
    94
 
C default
6423
fb374b1b3911 backout: reverse changeset belongs on current branch
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    95
 
C file1
Mercurial