Mercurial Mercurial > mercurial / 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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 17 Dec 2006 05:00:22 +0100
changeset 3923 27230c29bfec
parent 2769 2ace3bf43089
child 4195 e8ee8fdeddb1
permissions -rw-r--r--
fix calculation of new heads added during push with -r fix issue450
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
# basic operation
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
adding a
2407
8fe3d60b7f19 revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2303
diff changeset 
     3
 
reverting a
2303
78e7fd16f472 Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2268
diff changeset 
     4
 
changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
a
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
# file that was removed is recreated
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
adding a
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
adding a
2303
78e7fd16f472 Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2268
diff changeset 
     9
 
changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
content
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
# backout of backout is as if nothing happened
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
removing a
2303
78e7fd16f472 Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2268
diff changeset 
    13
 
changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
cat: a: No such file or directory
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
# backout with merge
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    16
 
adding a
2407
8fe3d60b7f19 revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2303
diff changeset 
    17
 
reverting a
2303
78e7fd16f472 Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2268
diff changeset 
    18
 
changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    19
 
merging with changeset 2:b66ea5b77abb
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    20
 
merging a
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2158
diff changeset 
    21
 
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 
    22
 
(branch merge, don't forget to commit)
2158
ec96c4518236 add backout command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    23
 
line 1
2492
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    24
 
# backout should not back out subsequent changesets
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    25
 
adding a
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    26
 
adding b
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    27
 
reverting a
2f4addf56715 Test case for #295
Brendan Cully <brendan@kublai.com>
parents: 2407
diff changeset 
    28
 
changeset 3:4cbb1e70196a 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 
    29
 
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 
    30
 
(use "backout --merge" if you want to auto-merge)
2493
9c660e691e90 print message after backout that tells that backout adds new head.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2492
diff changeset 
    31
 
b: No such file or directory
2619
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    32
 
adding a
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    33
 
adding b
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    34
 
adding c
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    35
 
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 
    36
 
adding d
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    37
 
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 
    38
 
(branch merge, don't forget to commit)
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    39
 
# backout of merge should fail
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    40
 
abort: cannot back out a merge changeset without --parent
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    41
 
# backout of merge with bad parent should fail
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    42
 
abort: cb9a9f314b8b is not a parent of b2f3bb92043e
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    43
 
# backout of non-merge with parent should fail
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    44
 
abort: cannot use --parent on non-merge changeset
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    45
 
# backout with valid parent should be ok
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    46
 
removing d
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    47
 
changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    48
 
rolling back last transaction
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    49
 
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 
    50
 
removing c
fc0ec2b64150 update test-backout.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2493
diff changeset 
    51
 
changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e
mercurial