Mercurial > hg

comparison tests/test-mq-safety.out @ 12378:ab237534d800 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: always require --force when pushing patches (issue2363) --force was not necessary when passing --rev since 55578a8d7e84, but this behaviour is usually harmful when branch names are passed instead of explicit revisions.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 22 Sep 2010 23:51:10 +0200
parents 6e65b451b62e
children
comparison
equal deleted inserted replaced
12360:4ae3e5dffa60 12378:ab237534d800
43 date: Thu Jan 01 00:00:00 1970 +0000 43 date: Thu Jan 01 00:00:00 1970 +0000
44 summary: a 44 summary: a
45 45
46 applying qp 46 applying qp
47 now at: qp 47 now at: qp
48 % testing applied patches, push and --force
49 adding a
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
51 marked working directory as branch branch
52 adding b
53 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
54 requesting all changes
55 adding changesets
56 adding manifests
57 adding file changes
58 added 1 changesets with 1 changes to 1 files
59 updating to branch default
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 % pushing applied patch with --rev without --force
62 pushing to ../forcepush2
63 abort: source has mq patches applied
64 % pushing applied patch with branchhash, without --force
65 pushing to ../forcepush2
66 abort: source has mq patches applied
67 % pushing revs excluding applied patch
68 pushing to ../forcepush2
69 searching for changes
70 adding changesets
71 adding manifests
72 adding file changes
73 added 1 changesets with 1 changes to 1 files
74 % pushing applied patch with --force
75 pushing to ../forcepush2
76 searching for changes
77 adding changesets
78 adding manifests
79 adding file changes
80 added 1 changesets with 1 changes to 1 files (+1 heads)