view tests/test-empty-group @ 2696:be273f6074de

mq: patch naming shortcuts This adds some more options to the mq lookup routine. It allows you to use shortcuts in naming patches to push or pop. You can now use: 1) a full patch name 2) a number to indicate an offset in the series file 3) a unique substring of the patch name 4) patchname[-+]num to indicate an offset from a given patch. For case #3 substrings are allowed. qtip and qbase are aliases for the top and bottom of the applied patch queue, unless they are already in the series file as patch names.
author Chris Mason <mason@suse.com>
date Thu, 27 Jul 2006 09:27:35 -0700
parents 11422943cf72
children c0b449154a90
line wrap: on
line source

#!/bin/sh
#
#  A          B    
#  
#  3  4       3    
#  |\/|       |\   
#  |/\|       | \  
#  1  2       1  2 
#  \ /        \ /  
#   0          0
#
# if the result of the merge of 1 and 2
# is the same in 3 and 4, no new manifest
# will be created and the manifest group
# will be empty during the pull
#
# (plus we test a failure where outgoing
# wrongly reported the number of csets)
#

hg init a
cd a
touch init
hg ci -A -m 0 -d "1000000 0"
touch x y
hg ci -A -m 1 -d "1000000 0"
hg update 0
touch x y
hg ci -A -m 2 -d "1000000 0"
hg merge 1
hg ci -A -m m1 -d "1000000 0"
#hg log
#hg debugindex .hg/00manifest.i
hg update -C 1
hg merge 2
hg ci -A -m m2 -d "1000000 0"
#hg log
#hg debugindex .hg/00manifest.i

cd ..
hg clone -r 3 a b
hg clone -r 4 a c
hg -R a outgoing b
hg -R a outgoing c
hg -R b outgoing c
hg -R c outgoing b

hg -R b pull a
hg -R c pull a