Mercurial > hg

annotate tests/test-mq-qrename @ 11965:77f1f206e135 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: don't inherit default and default-push paths with --mq (issue2333) Configuration from the outer repo is inherited to the patches repo when --mq is used. In case the patches repo only has paths.default configured but the outer repo has paths.default-push then the inherited default-push will win. Very confusing. Inheriting the default paths is however wrong in all sane cases, so now we explicitly remove them.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 18 Aug 2010 02:43:45 +0200
parents 0c944b7af564
children 4ae3e5dffa60
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3083
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 #!/bin/sh
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
3 echo "[extensions]" >> $HGRCPATH
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
4 echo "mq=" >> $HGRCPATH
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 hg init a
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 cd a
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 echo 'base' > base
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 hg ci -Ambase -d '1 0'
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 hg qnew -mmqbase mqbase
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
13 hg qrename mqbase renamed
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 mkdir .hg/patches/foo
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
15 hg qrename renamed foo
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
16 hg qseries
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
17 ls .hg/patches/foo
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
18 mkdir .hg/patches/bar
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
19 hg qrename foo/renamed bar
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
20 hg qseries
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
21 ls .hg/patches/bar
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
22 hg qrename bar/renamed baz
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
23 hg qseries
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
24 ls .hg/patches/baz
11513
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 6649
diff changeset
25 hg qrename baz new/dir
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 6649
diff changeset
26 hg qseries
0c944b7af564 mq: fixed ENOENT when qrename to new/directory.patch
Yuya Nishihara <yuya@tcha.org>
parents: 6649
diff changeset
27 ls .hg/patches/new/dir
6649
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
28 cd ..
3083
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
29
6649
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
30 echo % test patch being renamed before committed
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
31 hg init b
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
32 cd b
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
33 hg qinit -c
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
34 hg qnew x
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
35 hg qrename y
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
36 hg qcommit -m rename
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
37 cd ..
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
38
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
39