view tests/test-branches.out @ 7177:09ed32b79656

mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 19 Oct 2008 16:31:24 +0200
parents 92d44ec32430
children 405cacb06745
line wrap: on
line source

marked working directory as branch a
marked working directory as branch q
reset working directory to branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
created new head
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
marked working directory as branch c
marked working directory as branch a branch name much longer than the default justification used by branches
a branch name much longer than the default justification used by branches 7:10ff5895aa57
b                              4:aee39cd168d0
c                              6:589736a22561 (inactive)
a                              5:d8cbc61dbaa6 (inactive)
default                        0:19709c5a4e75 (inactive)
-------
a branch name much longer than the default justification used by branches 7:10ff5895aa57
b                              4:aee39cd168d0
--- Branch a
changeset:   5:d8cbc61dbaa6
branch:      a
parent:      2:881fe2b92ad0
user:        test
date:        Thu Jan 01 00:00:04 1970 +0000
summary:     Adding b branch head 2

changeset:   2:881fe2b92ad0
branch:      a
user:        test
date:        Thu Jan 01 00:00:02 1970 +0000
summary:     Adding to a branch

changeset:   1:dd6b440dd85a
branch:      a
user:        test
date:        Thu Jan 01 00:00:01 1970 +0000
summary:     Adding a branch

---- Branch b
changeset:   4:aee39cd168d0
branch:      b
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
summary:     Adding b branch head 1

changeset:   3:ac22033332d1
branch:      b
parent:      0:19709c5a4e75
user:        test
date:        Thu Jan 01 00:00:02 1970 +0000
summary:     Adding b branch